From 7c87bce4715ca291c8e449d9de3d92c69725d45c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jul 2020 16:55:32 +0200 Subject: Fix anonymous user theme --- client/src/app/core/theme/theme.service.ts | 8 ++++---- client/src/app/core/users/user.model.ts | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'client/src') diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts index 9dbf22e20..7e05fdddd 100644 --- a/client/src/app/core/theme/theme.service.ts +++ b/client/src/app/core/theme/theme.service.ts @@ -111,9 +111,9 @@ export class ThemeService { this.pluginService.reloadLoadedScopes() - this.localStorageService.setItem(User.KEYS.THEME, JSON.stringify(theme), false) + this.localStorageService.setItem(User.KEYS.LAST_ACTIVE_THEME, JSON.stringify(theme), false) } else { - this.localStorageService.removeItem(User.KEYS.THEME, false) + this.localStorageService.removeItem(User.KEYS.LAST_ACTIVE_THEME, false) } this.oldThemeName = currentTheme @@ -127,7 +127,7 @@ export class ThemeService { if (!this.auth.isLoggedIn()) { this.updateCurrentTheme() - this.localStorageService.watch([User.KEYS.THEME]).subscribe( + this.localStorageService.watch([ User.KEYS.THEME ]).subscribe( () => this.updateCurrentTheme() ) } @@ -138,7 +138,7 @@ export class ThemeService { } private loadAndSetFromLocalStorage () { - const lastActiveThemeString = this.localStorageService.getItem(User.KEYS.THEME) + const lastActiveThemeString = this.localStorageService.getItem(User.KEYS.LAST_ACTIVE_THEME) if (!lastActiveThemeString) return try { diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts index 6a56786d9..4256f370b 100644 --- a/client/src/app/core/users/user.model.ts +++ b/client/src/app/core/users/user.model.ts @@ -23,7 +23,8 @@ export class User implements UserServerModel { AUTO_PLAY_VIDEO: 'auto_play_video', SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO: 'auto_play_next_video', AUTO_PLAY_VIDEO_PLAYLIST: 'auto_play_video_playlist', - THEME: 'last_active_theme', + THEME: 'theme', + LAST_ACTIVE_THEME: 'last_active_theme', VIDEO_LANGUAGES: 'video_languages' } -- cgit v1.2.3