aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-12-13 09:32:36 +0100
committerChocobozzz <me@florianbigard.com>2019-12-13 09:33:06 +0100
commit7c93905d14bf7d86d04dbbffc6e6a510c852f360 (patch)
treef476f9253e0998c29ef7ff65f28a77d7c07be37b
parent94dfca3e35d10368fe424a48b0f78d9e0d04e724 (diff)
downloadPeerTube-7c93905d14bf7d86d04dbbffc6e6a510c852f360.tar.gz
PeerTube-7c93905d14bf7d86d04dbbffc6e6a510c852f360.tar.zst
PeerTube-7c93905d14bf7d86d04dbbffc6e6a510c852f360.zip
Fix theme loading
-rw-r--r--client/src/app/core/theme/theme.service.ts2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts4
2 files changed, 4 insertions, 2 deletions
diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts
index 9be8e7a2d..3eebc1acc 100644
--- a/client/src/app/core/theme/theme.service.ts
+++ b/client/src/app/core/theme/theme.service.ts
@@ -5,6 +5,7 @@ import { environment } from '../../../environments/environment'
5import { PluginService } from '@app/core/plugins/plugin.service' 5import { PluginService } from '@app/core/plugins/plugin.service'
6import { ServerConfigTheme } from '@shared/models' 6import { ServerConfigTheme } from '@shared/models'
7import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage' 7import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
8import { first } from 'rxjs/operators'
8 9
9@Injectable() 10@Injectable()
10export class ThemeService { 11export class ThemeService {
@@ -123,6 +124,7 @@ export class ThemeService {
123 } 124 }
124 125
125 this.auth.userInformationLoaded 126 this.auth.userInformationLoaded
127 .pipe(first())
126 .subscribe(() => this.updateCurrentTheme()) 128 .subscribe(() => this.updateCurrentTheme())
127 } 129 }
128 130
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 8378e83b8..12b74a846 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -279,14 +279,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
279 279
280 isAutoPlayEnabled () { 280 isAutoPlayEnabled () {
281 return ( 281 return (
282 this.user && this.user.autoPlayNextVideo || 282 (this.user && this.user.autoPlayNextVideo) ||
283 peertubeSessionStorage.getItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true' 283 peertubeSessionStorage.getItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true'
284 ) 284 )
285 } 285 }
286 286
287 isPlaylistAutoPlayEnabled () { 287 isPlaylistAutoPlayEnabled () {
288 return ( 288 return (
289 this.user && this.user.autoPlayNextVideoPlaylist || 289 (this.user && this.user.autoPlayNextVideoPlaylist) ||
290 peertubeSessionStorage.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true' 290 peertubeSessionStorage.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true'
291 ) 291 )
292 } 292 }