diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-06-05 09:34:41 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-06-05 09:34:41 +0200 |
| commit | 5555f886c0efbe6ee9c3ce5bac73bd3734a4e631 (patch) | |
| tree | b59f467b17328a457ebb6cfeadd4d452cc2a3436 | |
| parent | e56b20f5872bc640b59501817bc41fb0db09c253 (diff) | |
| download | PeerTube-5555f886c0efbe6ee9c3ce5bac73bd3734a4e631.tar.gz PeerTube-5555f886c0efbe6ee9c3ce5bac73bd3734a4e631.tar.zst PeerTube-5555f886c0efbe6ee9c3ce5bac73bd3734a4e631.zip | |
Do not import whole rxjs
| -rw-r--r-- | client/src/app/friends/friend.service.ts | 2 | ||||
| -rw-r--r-- | client/src/app/shared/users/auth.service.ts | 3 | ||||
| -rw-r--r-- | client/src/app/videos/shared/video.service.ts | 2 | ||||
| -rw-r--r-- | client/src/index.html | 3 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | import { Injectable } from '@angular/core'; | 1 | import { Injectable } from '@angular/core'; |
| 2 | import { Http, Response } from '@angular/http'; | 2 | import { Http, Response } from '@angular/http'; |
| 3 | import { Observable } from 'rxjs/Rx'; | 3 | import { Observable } from 'rxjs/Observable'; |
| 4 | 4 | ||
| 5 | import { AuthService } from '../shared'; | 5 | import { AuthService } from '../shared'; |
| 6 | 6 | ||
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 @@ | |||
| 1 | import { Injectable } from '@angular/core'; | 1 | import { Injectable } from '@angular/core'; |
| 2 | import { Headers, Http, RequestOptions, Response, URLSearchParams } from '@angular/http'; | 2 | import { Headers, Http, RequestOptions, Response, URLSearchParams } from '@angular/http'; |
| 3 | import { Observable, Subject } from 'rxjs/Rx'; | 3 | import { Observable } from 'rxjs/Observable'; |
| 4 | import { Subject } from 'rxjs/Subject'; | ||
| 4 | 5 | ||
| 5 | import { AuthStatus } from './auth-status.model'; | 6 | import { AuthStatus } from './auth-status.model'; |
| 6 | import { User } from './user.model'; | 7 | 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 @@ | |||
| 1 | import { Injectable } from '@angular/core'; | 1 | import { Injectable } from '@angular/core'; |
| 2 | import { Http, Response, URLSearchParams } from '@angular/http'; | 2 | import { Http, Response, URLSearchParams } from '@angular/http'; |
| 3 | import { Observable } from 'rxjs/Rx'; | 3 | import { Observable } from 'rxjs/Observable'; |
| 4 | 4 | ||
| 5 | import { Pagination } from './pagination.model'; | 5 | import { Pagination } from './pagination.model'; |
| 6 | import { Search } from '../../shared'; | 6 | 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 @@ | |||
| 15 | 15 | ||
| 16 | <!-- 3. Display the application --> | 16 | <!-- 3. Display the application --> |
| 17 | <body> | 17 | <body> |
| 18 | <my-app>Loading...</my-app> | 18 | <my-app> |
| 19 | </my-app> | ||
| 19 | </body> | 20 | </body> |
| 20 | </html> | 21 | </html> |
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'; | |||
| 12 | import '@angular/router-deprecated'; | 12 | import '@angular/router-deprecated'; |
| 13 | 13 | ||
| 14 | // RxJS | 14 | // RxJS |
| 15 | import 'rxjs/Observable'; | ||
| 16 | import 'rxjs/Subject'; | ||
| 17 | import 'rxjs/add/operator/catch'; | ||
| 15 | import 'rxjs/add/operator/map'; | 18 | import 'rxjs/add/operator/map'; |
| 16 | import 'rxjs/add/operator/mergeMap'; | 19 | import 'rxjs/add/operator/mergeMap'; |
| 17 | 20 | ||