From d396a937b642d616beb72dde54c0c2d37c7e8c30 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 29 Dec 2016 17:34:29 +0100
Subject: [PATCH] Client: upgrade angular dep'

---
 client/package.json                           | 18 +++++++++---------
 client/src/app/shared/shared.module.ts        | 19 ++++++++++---------
 .../video-watch/video-magnet.component.ts     |  2 +-
 .../video-watch/video-share.component.ts      |  2 +-
 client/src/vendor.ts                          |  8 ++++----
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/client/package.json b/client/package.json
index c31f04f7b..e9f41959d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -18,14 +18,14 @@
   },
   "license": "GPLv3",
   "dependencies": {
-    "@angular/common": "~2.3.0",
-    "@angular/compiler": "~2.3.0",
-    "@angular/core": "~2.3.0",
-    "@angular/forms": "~2.3.0",
-    "@angular/http": "~2.3.0",
-    "@angular/platform-browser": "~2.3.0",
-    "@angular/platform-browser-dynamic": "~2.3.0",
-    "@angular/router": "~3.3.0",
+    "@angular/common": "~2.4.1",
+    "@angular/compiler": "~2.4.1",
+    "@angular/core": "~2.4.1",
+    "@angular/forms": "~2.4.1",
+    "@angular/http": "~2.4.1",
+    "@angular/platform-browser": "~2.4.1",
+    "@angular/platform-browser-dynamic": "~2.4.1",
+    "@angular/router": "~3.4.1",
     "@angularclass/hmr": "^1.2.0",
     "@angularclass/hmr-loader": "^3.0.2",
     "@types/core-js": "^0.9.28",
@@ -51,7 +51,7 @@
     "ie-shim": "^0.1.0",
     "intl": "^1.2.4",
     "json-loader": "^0.5.4",
-    "ng2-bootstrap": "1.1.16",
+    "ng2-bootstrap": "1.1.16-10",
     "ng2-file-upload": "^1.1.0",
     "ng2-meta": "^2.0.0",
     "node-sass": "^3.10.0",
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 141922322..748c5d520 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -5,10 +5,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 
 import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
-import { DropdownModule } from 'ng2-bootstrap/components/dropdown';
-import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar';
-import { PaginationModule } from 'ng2-bootstrap/components/pagination';
-import { ModalModule } from 'ng2-bootstrap/components/modal';
+import { DropdownModule } from 'ng2-bootstrap/dropdown';
+import { ProgressbarModule } from 'ng2-bootstrap/progressbar';
+import { PaginationModule } from 'ng2-bootstrap/pagination';
+import { ModalModule } from 'ng2-bootstrap/modal';
 import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
 
 import { AUTH_HTTP_PROVIDERS } from './auth';
@@ -23,11 +23,12 @@ import { SearchComponent, SearchService } from './search';
     HttpModule,
     RouterModule,
 
-    DropdownModule,
-    FileUploadModule,
-    ModalModule,
-    PaginationModule,
-    ProgressbarModule
+    DropdownModule.forRoot(),
+    ModalModule.forRoot(),
+    PaginationModule.forRoot(),
+    ProgressbarModule.forRoot(),
+
+    FileUploadModule
   ],
 
   declarations: [
diff --git a/client/src/app/videos/video-watch/video-magnet.component.ts b/client/src/app/videos/video-watch/video-magnet.component.ts
index 2894e7df6..8bee848a4 100644
--- a/client/src/app/videos/video-watch/video-magnet.component.ts
+++ b/client/src/app/videos/video-watch/video-magnet.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, ViewChild } from '@angular/core';
 
-import { ModalDirective } from 'ng2-bootstrap/components/modal';
+import { ModalDirective } from 'ng2-bootstrap/modal';
 
 import { Video } from '../shared';
 
diff --git a/client/src/app/videos/video-watch/video-share.component.ts b/client/src/app/videos/video-watch/video-share.component.ts
index 8e6de1294..0b85052cd 100644
--- a/client/src/app/videos/video-watch/video-share.component.ts
+++ b/client/src/app/videos/video-watch/video-share.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, ViewChild } from '@angular/core';
 
-import { ModalDirective } from 'ng2-bootstrap/components/modal';
+import { ModalDirective } from 'ng2-bootstrap/modal';
 
 import { Video } from '../shared';
 
diff --git a/client/src/vendor.ts b/client/src/vendor.ts
index 760fc8257..436c58f48 100644
--- a/client/src/vendor.ts
+++ b/client/src/vendor.ts
@@ -29,7 +29,7 @@ import 'angular-pipes/src/math/bytes.pipe';
 import 'ng2-file-upload';
 import 'video.js';
 import 'ng2-meta';
-import 'ng2-bootstrap/components/pagination';
-import 'ng2-bootstrap/components/dropdown';
-import 'ng2-bootstrap/components/progressbar';
-import 'ng2-bootstrap/components/modal';
+import 'ng2-bootstrap/pagination';
+import 'ng2-bootstrap/dropdown';
+import 'ng2-bootstrap/progressbar';
+import 'ng2-bootstrap/modal';