feat: update to Angular 6 (#1684)

This commit is contained in:
Dmitry Nehaychik 2018-05-10 23:48:39 +03:00 committed by GitHub
parent fa3cdf731b
commit 06d2197583
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 5448 additions and 4039 deletions

View file

@ -1,5 +1,4 @@
import { Injectable } from '@angular/core';
import 'rxjs/add/observable/of';
export class Track {
name: string;

View file

@ -1,8 +1,7 @@
import { of as observableOf, Observable , BehaviorSubject } from 'rxjs';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import 'rxjs/add/observable/of';
@Injectable()
export class StateService {
@ -48,7 +47,7 @@ export class StateService {
}
getLayoutStates(): Observable<any[]> {
return Observable.of(this.layouts);
return observableOf(this.layouts);
}
onLayoutState(): Observable<any> {
@ -60,7 +59,7 @@ export class StateService {
}
getSidebarStates(): Observable<any[]> {
return Observable.of(this.sidebars);
return observableOf(this.sidebars);
}
onSidebarState(): Observable<any> {

View file

@ -1,6 +1,7 @@
import { of as observableOf, Observable } from 'rxjs';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
let counter = 0;
@ -23,15 +24,15 @@ export class UserService {
}
getUsers(): Observable<any> {
return Observable.of(this.users);
return observableOf(this.users);
}
getUserArray(): Observable<any[]> {
return Observable.of(this.userArray);
return observableOf(this.userArray);
}
getUser(): Observable<any> {
counter = (counter + 1) % this.userArray.length;
return Observable.of(this.userArray[counter]);
return observableOf(this.userArray[counter]);
}
}