projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e56b20f)
Do not import whole rxjs
authorChocobozzz <florian.bigard@gmail.com>
Sun, 5 Jun 2016 07:34:41 +0000 (09:34 +0200)
committerChocobozzz <florian.bigard@gmail.com>
Sun, 5 Jun 2016 07:34:41 +0000 (09:34 +0200)
client/src/app/friends/friend.service.ts patch | blob | history
client/src/app/shared/users/auth.service.ts patch | blob | history
client/src/app/videos/shared/video.service.ts patch | blob | history
client/src/index.html patch | blob | history
client/src/vendor.ts patch | blob | history

diff --git a/client/src/app/friends/friend.service.ts b/client/src/app/friends/friend.service.ts
index a8b1a1bd3527d8d6a544e9b4391cfa21a6990136..f956a5ece7d36541169fcfe757f91a360d658f98 100644 (file)
--- 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 d63fe38f3cb92fab3e73dc0f25029d666d588ae6..720037563beeada57d3c2c7d42942e627060046b 100644 (file)
--- 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 76d46cbb4aacb87eb20e5251f2a651eb3cfc6b59..dcbef77177945e191a8ec317848442012708ae53 100644 (file)
--- 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 f2f601779a2446960e275229e62003b640320d96..5cf491221b54c5645135b2c1535a90355ad52add 100644 (file)
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -15,6 +15,7 @@
 
   <!-- 3. Display the application -->
   <body>
-    <my-app>Loading...</my-app>
+    <my-app>
+    </my-app>
   </body>
 </html>
diff --git a/client/src/vendor.ts b/client/src/vendor.ts
index 6d7ebc3b428f5bc03936272ee6ea64dd24e337e7..496f44cf6cea941b7979dfcb405b545ab5f775a9 100644 (file)
--- 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';
 
Unnamed repository; edit this file 'description' to name the repository.