Merge branch 'develop' into swn
This commit is contained in:
@@ -16,6 +16,7 @@ if (localStorage.getItem('accounts') != null) {
|
||||
import * as Sentry from '@sentry/browser';
|
||||
import { Integrations } from '@sentry/tracing';
|
||||
import { computed, createApp, watch, markRaw } from 'vue';
|
||||
import compareVersions from 'compare-versions';
|
||||
|
||||
import widgets from '@client/widgets';
|
||||
import directives from '@client/directives';
|
||||
@@ -25,7 +26,7 @@ import { router } from '@client/router';
|
||||
import { applyTheme } from '@client/scripts/theme';
|
||||
import { isDeviceDarkmode } from '@client/scripts/is-device-darkmode';
|
||||
import { i18n } from '@client/i18n';
|
||||
import { stream, dialog, post } from '@client/os';
|
||||
import { stream, dialog, post, popup } from '@client/os';
|
||||
import * as sound from '@client/scripts/sound';
|
||||
import { $i, refreshAccount, login, updateAccount, signout } from '@client/account';
|
||||
import { defaultStore, ColdDeviceStorage } from '@client/store';
|
||||
@@ -227,6 +228,23 @@ if (splash) {
|
||||
splash.style.pointerEvents = 'none';
|
||||
}
|
||||
|
||||
// クライアントが更新されたか?
|
||||
const lastVersion = localStorage.getItem('lastVersion');
|
||||
if (lastVersion !== version) {
|
||||
localStorage.setItem('lastVersion', version);
|
||||
|
||||
// テーマリビルドするため
|
||||
localStorage.removeItem('theme');
|
||||
|
||||
try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため
|
||||
if (lastVersion != null && compareVersions(version, lastVersion) === 1) {
|
||||
popup(import('@client/components/updated.vue'), {}, {}, 'closed');
|
||||
}
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
|
||||
// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
|
||||
watch(defaultStore.reactiveState.darkMode, (darkMode) => {
|
||||
applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
|
||||
}, { immediate: localStorage.theme == null });
|
||||
|
Reference in New Issue
Block a user