mirror of
https://github.com/bitwarden/browser.git
synced 2024-09-12 01:48:21 +02:00
[bug] Update theme.js to refelect new storage structure (#1416)
* [bug] Update theme.js to refelect new storage structure * [bug] Remove unecassary defaults
This commit is contained in:
parent
6996b06fa2
commit
ce1ae208d1
@ -19,7 +19,7 @@ export class OptionsComponent implements OnInit {
|
||||
disableIcons: boolean;
|
||||
enableGravatars: boolean;
|
||||
enableFullWidth: boolean;
|
||||
theme: ThemeType = ThemeType.Light;
|
||||
theme: ThemeType;
|
||||
locale: string;
|
||||
vaultTimeouts: { name: string; value: number }[];
|
||||
localeOptions: any[];
|
||||
@ -28,7 +28,7 @@ export class OptionsComponent implements OnInit {
|
||||
vaultTimeout: FormControl = new FormControl(null);
|
||||
|
||||
private startingLocale: string;
|
||||
private startingTheme: ThemeType = ThemeType.Light;
|
||||
private startingTheme: ThemeType;
|
||||
|
||||
constructor(
|
||||
private stateService: StateService,
|
||||
|
13
src/theme.js
13
src/theme.js
@ -6,17 +6,16 @@
|
||||
const htmlEl = document.documentElement;
|
||||
let theme = defaultTheme;
|
||||
|
||||
const stateJson = window.localStorage.getItem("state");
|
||||
if (stateJson != null) {
|
||||
const globals = JSON.parse(stateJson).globals;
|
||||
if (globals != null && globals.theme != null) {
|
||||
if (globals.theme.indexOf("system") > -1) {
|
||||
const globalState = window.localStorage.getItem("global");
|
||||
if (globalState != null) {
|
||||
const globalStateJson = JSON.parse(globalState);
|
||||
if (globalStateJson != null && globalStateJson.theme != null) {
|
||||
if (globalStateJson.theme.indexOf("system") > -1) {
|
||||
theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
|
||||
} else if (globals.theme.indexOf("dark") > -1) {
|
||||
} else if (globalStateJson.theme.indexOf("dark") > -1) {
|
||||
theme = "dark";
|
||||
}
|
||||
}
|
||||
|
||||
if (!htmlEl.classList.contains("theme_" + theme)) {
|
||||
htmlEl.classList.remove("theme_" + defaultTheme);
|
||||
htmlEl.classList.add("theme_" + theme);
|
||||
|
Loading…
Reference in New Issue
Block a user