Browse Source

refactor: use forkJoin instead of concat

pull/3469/head
mehmet-erim 7 years ago
parent
commit
f9d56c6441
  1. 8
      npm/ng-packs/apps/dev-app/src/app/app.component.ts
  2. 10
      templates/app/angular/src/app/app.component.ts

8
npm/ng-packs/apps/dev-app/src/app/app.component.ts

@ -1,6 +1,6 @@
import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core'; import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { concat } from 'rxjs'; import { forkJoin } from 'rxjs';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -13,12 +13,12 @@ export class AppComponent implements OnInit {
constructor(private lazyLoadService: LazyLoadService) {} constructor(private lazyLoadService: LazyLoadService) {}
ngOnInit() { ngOnInit() {
concat( forkJoin(
this.lazyLoadService.load( this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'), LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'),
), ),
this.lazyLoadService.load( this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'), LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'),
), ),
).subscribe(); ).subscribe();
} }

10
templates/app/angular/src/app/app.component.ts

@ -1,6 +1,6 @@
import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core'; import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core';
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { concat } from 'rxjs'; import { forkJoin } from 'rxjs';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -13,13 +13,13 @@ export class AppComponent implements OnInit {
constructor(private lazyLoadService: LazyLoadService) {} constructor(private lazyLoadService: LazyLoadService) {}
ngOnInit() { ngOnInit() {
concat( forkJoin(
this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
),
this.lazyLoadService.load( this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css') LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css')
) )
this.lazyLoadService.load(
LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css')
),
).subscribe(); ).subscribe();
} }
} }

Loading…
Cancel
Save