Browse Source
Merge pull request #19551 from abpframework/auto-merge/rel-8-1/2637
Merge branch dev with rel-8.1
pull/19556/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
4 deletions
-
docs/en/UI/Angular/Lazy-Load-Service.md
-
npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
|
|
|
@ -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'), |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
@ -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(); |
|
|
|
} |
|
|
|
}); |
|
|
|
|