diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-25 23:21:48 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-25 23:21:48 +0900 |
| commit | ef01eec36e35764eb5ee5ad55abbc611daac9e27 (patch) | |
| tree | 900882d9def0736a31352db653af79a3c22eee3b /src/client/init.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.26.0 (diff) | |
| download | misskey-ef01eec36e35764eb5ee5ad55abbc611daac9e27.tar.gz misskey-ef01eec36e35764eb5ee5ad55abbc611daac9e27.tar.bz2 misskey-ef01eec36e35764eb5ee5ad55abbc611daac9e27.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/init.ts')
| -rw-r--r-- | src/client/init.ts | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/client/init.ts b/src/client/init.ts index b9c6aedae4..1fcd97190d 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -145,6 +145,12 @@ os.init(async () => { } }, false) + os.store.watch(state => state.device.darkMode, darkMode => { + // TODO: このファイルでbuiltinThemesを参照するとcode splittingが効かず、初回読み込み時に全てのテーマコードを読み込むことになってしまい無駄なので何とかする + const themes = builtinThemes.concat(os.store.state.device.themes); + applyTheme(themes.find(x => x.id === (darkMode ? os.store.state.device.darkTheme : os.store.state.device.lightTheme))); + }); + //#region Sync dark mode if (os.store.state.device.syncDeviceDarkMode) { os.store.commit('device/set', { key: 'darkMode', value: isDeviceDarkmode() }); @@ -176,13 +182,6 @@ os.init(async () => { isMobile: isMobile }; }, - watch: { - '$store.state.device.darkMode'() { - // TODO: このファイルでbuiltinThemesを参照するとcode splittingが効かず、初回読み込み時に全てのテーマコードを読み込むことになってしまい無駄なので何とかする - const themes = builtinThemes.concat(this.$store.state.device.themes); - applyTheme(themes.find(x => x.id === (this.$store.state.device.darkMode ? this.$store.state.device.darkTheme : this.$store.state.device.lightTheme))); - } - }, methods: { api: os.api, signout: os.signout, |