From bf7e564bf654f58b9c3e8168c68431ad3579920d Mon Sep 17 00:00:00 2001 From: Muhammad Mabrouk Date: Mon, 15 Apr 2024 14:33:31 +0200 Subject: [PATCH 1/3] Fix some typos with Lazy-Load-Service.md --- docs/en/UI/Angular/Lazy-Load-Service.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/UI/Angular/Lazy-Load-Service.md b/docs/en/UI/Angular/Lazy-Load-Service.md index 0e1f7928c7..eccea527ab 100644 --- a/docs/en/UI/Angular/Lazy-Load-Service.md +++ b/docs/en/UI/Angular/Lazy-Load-Service.md @@ -42,7 +42,7 @@ import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core'; ` }) class DemoComponent { - libraryLoaded$ = this.lazyLoad.load( + libraryLoaded$ = this.lazyLoadService.load( LOADING_STRATEGY.AppendAnonymousScriptToHead('/assets/some-library.js'), ); @@ -71,7 +71,7 @@ import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core'; ` }) class DemoComponent { - stylesLoaded$ = this.lazyLoad.load( + stylesLoaded$ = this.lazyLoadService.load( LOADING_STRATEGY.AppendAnonymousStyleToHead('/assets/some-styles.css'), ); From e28b06a3a13b33380fa6eda97f0328f0e244b0f3 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Mon, 15 Apr 2024 17:39:21 +0300 Subject: [PATCH 2/3] update logic of showing a confirmation before refreshing the page --- .../theme-shared/src/lib/components/modal/modal.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index 297fa23c56..d7c24c7601 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -206,8 +206,7 @@ export class ModalComponent implements OnInit, OnDestroy, DismissableModal { fromEvent(window, 'beforeunload') .pipe(takeUntil(this.destroy$)) .subscribe(event => { - // TODO: check this - if (!this.isFormDirty || this.suppressUnsavedChangesWarning) { + if (this.isFormDirty && !this.suppressUnsavedChangesWarning) { event.preventDefault(); } }); From 9288f841d0587cc2a91749b0fcd4b904bf4eb99a Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 16 Apr 2024 09:07:30 +0300 Subject: [PATCH 3/3] Update common.props --- common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.props b/common.props index 486fe0f53a..84cb386666 100644 --- a/common.props +++ b/common.props @@ -1,8 +1,8 @@ latest - 8.1.0 - 3.1.0 + 8.1.1 + 3.1.1 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/