Browse Source

fix(core): lazy load return

pull/1858/head
mehmet-erim 7 years ago
parent
commit
404eba79c0
  1. 4
      npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts
  2. 4
      npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
  3. 2
      npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
  4. 18
      npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

4
npm/ng-packs/packages/core/src/lib/services/lazy-load.service.ts

@ -30,7 +30,9 @@ export class LazyLoadService {
const key = url ? url.slice(url.lastIndexOf('/') + 1) : uuid(); const key = url ? url.slice(url.lastIndexOf('/') + 1) : uuid();
if (this.loadedLibraries[key]) { if (this.loadedLibraries[key]) {
return this.loadedLibraries[key].asObservable(); subscriber.next();
subscriber.complete();
return;
} }
this.loadedLibraries[key] = new ReplaySubject(); this.loadedLibraries[key] = new ReplaySubject();

4
npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts

@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
@Component({ @Component({
selector: 'abp-button', selector: 'abp-button',
template: ` template: `
<button [attr.type]="buttonType || type" [ngClass]="buttonClass" [disabled]="loading || disabled"> <button [attr.type]="type" [ngClass]="buttonClass" [disabled]="loading || disabled">
<i [ngClass]="icon" class="mr-1"></i><ng-content></ng-content> <i [ngClass]="icon" class="mr-1"></i><ng-content></ng-content>
</button> </button>
`, `,
@ -13,7 +13,7 @@ export class ButtonComponent {
buttonClass = 'btn btn-primary'; buttonClass = 'btn btn-primary';
@Input() @Input()
buttonType = 'button'; buttonType; // TODO: Add initial value.
@Input() @Input()
iconClass: string; iconClass: string;

2
npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts

@ -38,7 +38,7 @@ export default `
left: 0 !important; left: 0 !important;
width: 100% !important; width: 100% !important;
height: 100% !important; height: 100% !important;
background-color: rgba(0, 0, 0, .6) !important; background-color: rgba(0, 0, 0, 0.6) !important;
z-index: 1040 !important; z-index: 1040 !important;
} }

18
npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

@ -32,9 +32,9 @@ export function appendScript(injector: Injector) {
'style', 'style',
styles, styles,
'head', 'head',
'afterbegin' 'afterbegin',
) /* lazyLoadService.load(null, 'script', scripts) */ ) /* lazyLoadService.load(null, 'script', scripts) */,
).pipe(take(1)); ).toPromise();
}; };
return fn; return fn;
@ -53,7 +53,7 @@ export function appendScript(injector: Injector) {
ModalComponent, ModalComponent,
ProfileComponent, ProfileComponent,
TableEmptyMessageComponent, TableEmptyMessageComponent,
ToastComponent ToastComponent,
], ],
exports: [ exports: [
BreadcrumbComponent, BreadcrumbComponent,
@ -65,9 +65,9 @@ export function appendScript(injector: Injector) {
ModalComponent, ModalComponent,
ProfileComponent, ProfileComponent,
TableEmptyMessageComponent, TableEmptyMessageComponent,
ToastComponent ToastComponent,
], ],
entryComponents: [ErrorComponent] entryComponents: [ErrorComponent],
}) })
export class ThemeSharedModule { export class ThemeSharedModule {
static forRoot(): ModuleWithProviders { static forRoot(): ModuleWithProviders {
@ -78,10 +78,10 @@ export class ThemeSharedModule {
provide: APP_INITIALIZER, provide: APP_INITIALIZER,
multi: true, multi: true,
deps: [Injector, ErrorHandler], deps: [Injector, ErrorHandler],
useFactory: appendScript useFactory: appendScript,
}, },
{ provide: MessageService, useClass: MessageService } { provide: MessageService, useClass: MessageService },
] ],
}; };
} }
} }

Loading…
Cancel
Save