Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[chore] Update jslib (#1277) 

* [chore] Update jslib

* [bug] Correct value for system theme dropdown key

* [chore] Update jslib
This commit is contained in:
Addison Beck 2022-01-31 18:00:37 -05:00 committed by GitHub
parent c1ba54f646
commit 2b22a39d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit e372bf242b24f55c1142e33693ad2c801ab74c93
Subproject commit 92a65b7b368a8dbf55350657674c90169b04c30b

2
src/app/accounts/settings.component.ts
View File

@ -135,7 +135,7 @@ export class SettingsComponent implements OnInit {
this.localeOptions = localeOptions;
this.themeOptions = [
{ name: i18nService.t("default"), value: null },
{ name: i18nService.t("default"), value: ThemeType.System },
{ name: i18nService.t("light"), value: ThemeType.Light },
{ name: i18nService.t("dark"), value: ThemeType.Dark },
{ name: "Nord", value: ThemeType.Nord },

6
src/app/services.module.ts
View File

@ -47,7 +47,9 @@ import { ThemeType } from "jslib-common/enums/themeType";
import { Account } from "../models/account";
import { AccountFactory } from "jslib-common/models/domain/account";
import { GlobalState } from "jslib-common/models/domain/globalState";
import { StateFactory } from "jslib-common/factories/stateFactory";
export function initFactory(
window: Window,
@ -190,7 +192,7 @@ export function initFactory(
secureStorageService,
logService,
stateMigrationService,
new AccountFactory(Account)
new StateFactory(GlobalState, Account)
),
deps: [
StorageServiceAbstraction,

8
src/main.ts
View File

@ -22,7 +22,11 @@ import { NativeMessagingMain } from "./main/nativeMessaging.main";
import { StateService } from "jslib-common/services/state.service";
import { Account, AccountFactory } from "jslib-common/models/domain/account";
import { Account } from "./models/account";
import { GlobalState } from "jslib-common/models/domain/globalState";
import { StateFactory } from "jslib-common/factories/stateFactory";
export class Main {
logService: ElectronLogService;
@ -86,7 +90,7 @@ export class Main {
null,
this.logService,
null,
new AccountFactory(Account)
new StateFactory(GlobalState, Account)
);
this.windowMain = new WindowMain(