This commit is contained in:
syuilo
2024-08-25 21:03:58 +09:00
parent 0a0c93df2a
commit bc02fd5c4d
8 changed files with 23 additions and 53 deletions

View File

@@ -10,7 +10,6 @@ import {
set as iset,
del as idel,
} from 'idb-keyval';
import { embedPage } from '@/config.js';
import { miLocalStorage } from '@/local-storage.js';
const PREFIX = 'idbfallback::';
@@ -27,10 +26,7 @@ if (window.Cypress) {
console.log('Cypress detected. It will use localStorage.');
}
if (embedPage) {
idbAvailable = false;
console.log('Embed page detected. It will use safeSessionStorage.');
} else if (idbAvailable) {
if (idbAvailable) {
await iset('idb-test', 'test')
.catch(err => {
console.error('idb error', err);

View File

@@ -7,7 +7,6 @@ import { defineAsyncComponent, inject } from 'vue';
import { $i } from '@/account.js';
import { i18n } from '@/i18n.js';
import { popup } from '@/os.js';
import { embedPage } from '@/config.js';
export type OpenOnRemoteOptions = {
/**
@@ -48,22 +47,18 @@ export type OpenOnRemoteOptions = {
export function pleaseLogin(path?: string, openOnRemote?: OpenOnRemoteOptions) {
if ($i) return;
if (embedPage) {
window.open(path ?? '/', '_blank', 'noopener');
} else {
const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
autoSet: true,
message: openOnRemote ? i18n.ts.signinOrContinueOnRemote : i18n.ts.signinRequired,
openOnRemote,
}, {
cancelled: () => {
if (path) {
window.location.href = path;
}
},
closed: () => dispose(),
});
}
const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
autoSet: true,
message: openOnRemote ? i18n.ts.signinOrContinueOnRemote : i18n.ts.signinRequired,
openOnRemote,
}, {
cancelled: () => {
if (path) {
window.location.href = path;
}
},
closed: () => dispose(),
});
throw new Error('signin required');
}

View File

@@ -11,7 +11,6 @@ import { globalEvents } from '@/events.js';
import lightTheme from '@/themes/_light.json5';
import darkTheme from '@/themes/_dark.json5';
import { miLocalStorage } from '@/local-storage.js';
import { embedPage } from '@/config.js';
export type Theme = {
id: string;
@@ -96,9 +95,7 @@ export function applyTheme(theme: Theme, persist = true) {
document.documentElement.style.setProperty(`--${k}`, v.toString());
}
if (!embedPage) {
document.documentElement.style.setProperty('color-scheme', colorScheme);
}
document.documentElement.style.setProperty('color-scheme', colorScheme);
if (persist) {
miLocalStorage.setItem('theme', JSON.stringify(props));