From f9d56c64418326e9a93be50bc66392a2060fa203 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 3 Apr 2020 11:06:59 +0300 Subject: [PATCH] refactor: use forkJoin instead of concat --- npm/ng-packs/apps/dev-app/src/app/app.component.ts | 8 ++++---- templates/app/angular/src/app/app.component.ts | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/src/app/app.component.ts b/npm/ng-packs/apps/dev-app/src/app/app.component.ts index d9018f0a39..8187365734 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.component.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.component.ts @@ -1,6 +1,6 @@ import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core'; import { Component, OnInit } from '@angular/core'; -import { concat } from 'rxjs'; +import { forkJoin } from 'rxjs'; @Component({ selector: 'app-root', @@ -13,12 +13,12 @@ export class AppComponent implements OnInit { constructor(private lazyLoadService: LazyLoadService) {} ngOnInit() { - concat( + forkJoin( this.lazyLoadService.load( - LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'), + LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'), ), this.lazyLoadService.load( - LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css'), + LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css'), ), ).subscribe(); } diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts index 0c397f5bb8..e4e827c766 100644 --- a/templates/app/angular/src/app/app.component.ts +++ b/templates/app/angular/src/app/app.component.ts @@ -1,6 +1,6 @@ import { LazyLoadService, LOADING_STRATEGY } from '@abp/ng.core'; import { Component, OnInit } from '@angular/core'; -import { concat } from 'rxjs'; +import { forkJoin } from 'rxjs'; @Component({ selector: 'app-root', @@ -13,13 +13,13 @@ export class AppComponent implements OnInit { constructor(private lazyLoadService: LazyLoadService) {} ngOnInit() { - concat( - this.lazyLoadService.load( - LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css') - ), + forkJoin( this.lazyLoadService.load( LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-v4-shims.min.css') ) + this.lazyLoadService.load( + LOADING_STRATEGY.PrependAnonymousStyleToHead('fontawesome-all.min.css') + ), ).subscribe(); } }