From 5555f886c0efbe6ee9c3ce5bac73bd3734a4e631 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 5 Jun 2016 09:34:41 +0200 Subject: [PATCH] Do not import whole rxjs --- client/src/app/friends/friend.service.ts | 2 +- client/src/app/shared/users/auth.service.ts | 3 ++- client/src/app/videos/shared/video.service.ts | 2 +- client/src/index.html | 3 ++- client/src/vendor.ts | 3 +++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/src/app/friends/friend.service.ts b/client/src/app/friends/friend.service.ts index a8b1a1bd3..f956a5ece 100644 --- a/client/src/app/friends/friend.service.ts +++ b/client/src/app/friends/friend.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Http, Response } from '@angular/http'; -import { Observable } from 'rxjs/Rx'; +import { Observable } from 'rxjs/Observable'; import { AuthService } from '../shared'; diff --git a/client/src/app/shared/users/auth.service.ts b/client/src/app/shared/users/auth.service.ts index d63fe38f3..720037563 100644 --- a/client/src/app/shared/users/auth.service.ts +++ b/client/src/app/shared/users/auth.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { Headers, Http, RequestOptions, Response, URLSearchParams } from '@angular/http'; -import { Observable, Subject } from 'rxjs/Rx'; +import { Observable } from 'rxjs/Observable'; +import { Subject } from 'rxjs/Subject'; import { AuthStatus } from './auth-status.model'; import { User } from './user.model'; diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts index 76d46cbb4..dcbef7717 100644 --- a/client/src/app/videos/shared/video.service.ts +++ b/client/src/app/videos/shared/video.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Http, Response, URLSearchParams } from '@angular/http'; -import { Observable } from 'rxjs/Rx'; +import { Observable } from 'rxjs/Observable'; import { Pagination } from './pagination.model'; import { Search } from '../../shared'; diff --git a/client/src/index.html b/client/src/index.html index f2f601779..5cf491221 100644 --- a/client/src/index.html +++ b/client/src/index.html @@ -15,6 +15,7 @@ - Loading... + + diff --git a/client/src/vendor.ts b/client/src/vendor.ts index 6d7ebc3b4..496f44cf6 100644 --- a/client/src/vendor.ts +++ b/client/src/vendor.ts @@ -12,6 +12,9 @@ import '@angular/http'; import '@angular/router-deprecated'; // RxJS +import 'rxjs/Observable'; +import 'rxjs/Subject'; +import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/operator/mergeMap';