aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2017-12-12 11:59:28 +0100
committerChocobozzz <me@florianbigard.com>2017-12-12 13:58:03 +0100
commitb682782093a22a729eea8862476ff1c8aac4ef0c (patch)
tree40ab06be62df07d43ff7799011e4e3427b348eec /client/src
parent7bfd1b1edb7ea4ea6516b6a74c4e9af938d0bdc6 (diff)
downloadPeerTube-b682782093a22a729eea8862476ff1c8aac4ef0c.tar.gz
PeerTube-b682782093a22a729eea8862476ff1c8aac4ef0c.tar.zst
PeerTube-b682782093a22a729eea8862476ff1c8aac4ef0c.zip
Upgrade to angular 5
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/shared/account/account.model.ts2
-rw-r--r--client/src/assets/player/peertube-videojs-plugin.ts2
-rw-r--r--client/src/main.ts15
-rw-r--r--client/src/polyfills.ts6
4 files changed, 12 insertions, 13 deletions
diff --git a/client/src/app/shared/account/account.model.ts b/client/src/app/shared/account/account.model.ts
index 9d1fd3e1d..3a29ec979 100644
--- a/client/src/app/shared/account/account.model.ts
+++ b/client/src/app/shared/account/account.model.ts
@@ -16,6 +16,6 @@ export class Account implements ServerAccount {
16 static GET_ACCOUNT_AVATAR_PATH (account: Account) { 16 static GET_ACCOUNT_AVATAR_PATH (account: Account) {
17 if (account && account.avatar) return account.avatar.path 17 if (account && account.avatar) return account.avatar.path
18 18
19 return environment.apiUrl + '/client/assets/images/default-avatar.png' 19 return '/client/assets/images/default-avatar.png'
20 } 20 }
21} 21}
diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts
index 8b50e323e..d9dc2615b 100644
--- a/client/src/assets/player/peertube-videojs-plugin.ts
+++ b/client/src/assets/player/peertube-videojs-plugin.ts
@@ -2,7 +2,7 @@
2 2
3import * as videojs from 'video.js' 3import * as videojs from 'video.js'
4import * as WebTorrent from 'webtorrent' 4import * as WebTorrent from 'webtorrent'
5import { VideoFile } from '../../../../shared' 5import { VideoFile } from '../../../../shared/models/videos/video.model'
6 6
7import { renderVideo } from './video-renderer' 7import { renderVideo } from './video-renderer'
8 8
diff --git a/client/src/main.ts b/client/src/main.ts
index 91ec6da5f..f3825fe50 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -1,12 +1,13 @@
1import { enableProdMode } from '@angular/core'; 1import { enableProdMode } from '@angular/core'
2import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; 2import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
3 3
4import { AppModule } from './app/app.module'; 4import { AppModule } from './app/app.module'
5import { environment } from './environments/environment'; 5import { environment } from './environments/environment'
6 6
7if (environment.production) { 7if (environment.production) {
8 enableProdMode(); 8 enableProdMode()
9} 9}
10 10
11platformBrowserDynamic().bootstrapModule(AppModule) 11platformBrowserDynamic()
12 .catch(err => console.log(err)); 12 .bootstrapModule(AppModule)
13 .catch(err => console.log(err))
diff --git a/client/src/polyfills.ts b/client/src/polyfills.ts
index d68672ffe..c2d7f1d6e 100644
--- a/client/src/polyfills.ts
+++ b/client/src/polyfills.ts
@@ -43,7 +43,7 @@
43 43
44/** Evergreen browsers require these. **/ 44/** Evergreen browsers require these. **/
45// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. 45// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
46import 'core-js/es7/reflect'; 46import 'core-js/es7/reflect'
47 47
48 48
49/** 49/**
@@ -53,12 +53,10 @@ import 'core-js/es7/reflect';
53// import 'web-animations-js'; // Run `npm install --save web-animations-js`. 53// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
54 54
55 55
56
57/*************************************************************************************************** 56/***************************************************************************************************
58 * Zone JS is required by default for Angular itself. 57 * Zone JS is required by default for Angular itself.
59 */ 58 */
60import 'zone.js/dist/zone'; // Included with Angular CLI. 59import 'zone.js/dist/zone' // Included with Angular CLI.
61
62 60
63 61
64/*************************************************************************************************** 62/***************************************************************************************************