summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authoryupix <yupi0982@outlook.jp>2023-01-27 13:52:51 +0900
committerGitHub <noreply@github.com>2023-01-27 13:52:51 +0900
commit7190bd00c9dec5e0054cd52be05cc9f294485158 (patch)
treecff9ff124e4feeca3de6deb6a2451d5050fb5f69 /packages
parent13.2.5 (diff)
downloadmisskey-7190bd00c9dec5e0054cd52be05cc9f294485158.tar.gz
misskey-7190bd00c9dec5e0054cd52be05cc9f294485158.tar.bz2
misskey-7190bd00c9dec5e0054cd52be05cc9f294485158.zip
feat: classicモードでテーマが自動変更された際元に戻すように (#9669)
* feat: classicモードでテーマが自動変更された際元に戻すように * docs: update CHANGELOG.md * fix: prefixを miux:ui_temp から ui_temp に変更
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/local-storage.ts1
-rw-r--r--packages/frontend/src/ui/classic.vue2
-rw-r--r--packages/frontend/src/ui/universal.vue9
3 files changed, 12 insertions, 0 deletions
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index 68dc9ebe41..e6b828696c 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -18,6 +18,7 @@ type Keys =
'useSystemFont' |
'fontSize' |
'ui' |
+ 'ui_temp' |
'locale' |
'localeVersion' |
'theme' |
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index dab4b9b274..a5c2f8ca23 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -124,6 +124,8 @@ function onAiClick(ev) {
}
if (window.innerWidth < 1024) {
+ const currentUI = miLocalStorage.getItem('ui')
+ miLocalStorage.setItem('ui_temp', currentUI || 'default');
miLocalStorage.setItem('ui', 'default');
location.reload();
}
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index babc232875..a9bb85ab6a 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -141,6 +141,15 @@ mainRouter.on('change', () => {
document.documentElement.style.overflowY = 'scroll';
+if (window.innerWidth > 1024) {
+ const tempUI = miLocalStorage.getItem('ui_temp')
+ if (tempUI) {
+ miLocalStorage.setItem('ui', tempUI)
+ miLocalStorage.removeItem('ui_temp')
+ location.reload();
+ }
+}
+
defaultStore.ready.then(() => {
if (defaultStore.state.widgets.length === 0) {
defaultStore.set('widgets', [{