diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-10-09 19:12:40 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-10-09 19:12:40 +0200 |
commit | db7af09bd8e9de57cdda88c2e32387551235b3a4 (patch) | |
tree | 8e3cac831be63a2c66e3b6d5e3b22e33492fb726 /client/src/app/app.component.ts | |
parent | bcd1c9e19447a98d605385fab69b5cfa58d0ba4b (diff) | |
download | PeerTube-db7af09bd8e9de57cdda88c2e32387551235b3a4.tar.gz PeerTube-db7af09bd8e9de57cdda88c2e32387551235b3a4.tar.zst PeerTube-db7af09bd8e9de57cdda88c2e32387551235b3a4.zip |
Client: fix loading server configurations
Diffstat (limited to 'client/src/app/app.component.ts')
-rw-r--r-- | client/src/app/app.component.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 82e647c98..68719f73d 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component, OnInit, ViewContainerRef } from '@angular/core' | 1 | import { Component, OnInit, ViewContainerRef } from '@angular/core' |
2 | import { Router } from '@angular/router' | 2 | import { Router } from '@angular/router' |
3 | 3 | ||
4 | import { AuthService, ConfigService } from './core' | 4 | import { AuthService, ServerService } from './core' |
5 | import { UserService } from './shared' | 5 | import { UserService } from './shared' |
6 | 6 | ||
7 | @Component({ | 7 | @Component({ |
@@ -28,7 +28,7 @@ export class AppComponent implements OnInit { | |||
28 | constructor ( | 28 | constructor ( |
29 | private router: Router, | 29 | private router: Router, |
30 | private authService: AuthService, | 30 | private authService: AuthService, |
31 | private configService: ConfigService, | 31 | private serverService: ServerService, |
32 | private userService: UserService | 32 | private userService: UserService |
33 | ) {} | 33 | ) {} |
34 | 34 | ||
@@ -40,7 +40,11 @@ export class AppComponent implements OnInit { | |||
40 | this.userService.checkTokenValidity() | 40 | this.userService.checkTokenValidity() |
41 | } | 41 | } |
42 | 42 | ||
43 | this.configService.loadConfig() | 43 | // Load custom data from server |
44 | this.serverService.loadConfig() | ||
45 | this.serverService.loadVideoCategories() | ||
46 | this.serverService.loadVideoLanguages() | ||
47 | this.serverService.loadVideoLicences() | ||
44 | 48 | ||
45 | // Do not display menu on small screens | 49 | // Do not display menu on small screens |
46 | if (window.innerWidth < 600) { | 50 | if (window.innerWidth < 600) { |