Project

General

Profile

« Previous | Next » 

Revision 61146

Added by Konstantinos Triantafyllou almost 3 years ago

[Library | Angular 10]: Merge changes from angular 9

View differences:

class-help-content-form.component.ts
8 8 
import {Session} from '../../login/utils/helper.class';
9 9 
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
10 10 
import {properties} from '../../../../environments/environment';
11 
import {Observable, Subscriber, Subscription} from 'rxjs';
11 
import {Subscriber, Subscription, zip} from 'rxjs';
12 12 
import {HelperFunctions} from '../../utils/HelperFunctions.class';
13 13 
import {ConnectHelper} from '../../connect/connectHelper';
14 14 
import {DivHelpContent} from '../../utils/entities/adminTool/div-help-content';
15 

  		




  15
  16
  
    
declare var UIkit;


  		




  16
  17
  
    

  		




  17
  18
  
    
@Component({


  		




  ......




  75
  76
  
    
  


  		




  76
  77
  
    
  getInfo(pageId: string) {


  		




  77
  78
  
    
    this.showLoading = true;


  		




  78
  
  
    
    let obs = Observable.zip(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal),


  		




  
  79
  
    
    let obs = zip(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal),


  		




  79
  80
  
    
      this._helpContentService.getDivIdsFullByPortal(pageId, this.properties.adminToolsAPIURL, this.portal));


  		




  80
  81
  
    
    this.subs.push(obs.subscribe(


  		




  81
  82
  
    
      results => {


  		












Also available in:  Unified diff