usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
tamaina 2021-02-24 19:27:00 +09:00
parent a7180b3262
commit 40d12949b1
2 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/scripts/idb-proxy.ts
View File

@ -2,22 +2,33 @@
import {
get as iget,
set as iset,
del as idel
del as idel,
} from 'idb-keyval';
const fallbackName = (key: string) => `idbfallback::${key}`;
let idbAvailable = !!window.indexedDB;
if (idbAvailable) {
try {
const request = indexedDB.open('keyval-store');
if (request.error) idbAvailable = false;
} catch (e) {
idbAvailable = false;
}
}
export async function get(key: string) {
if (window.indexedDB) return iget(key);
if (idbAvailable) return iget(key);
return JSON.parse(localStorage.getItem(fallbackName(key)));
}
export async function set(key: string, val: any) {
if (window.indexedDB) return iset(key, val);
if (idbAvailable) return iset(key, val);
return localStorage.setItem(fallbackName(key), JSON.stringify(val));
}
export async function del(key: string) {
if (window.indexedDB) return idel(key);
if (idbAvailable) return idel(key);
return localStorage.removeItem(fallbackName(key));
}

72
src/client/ui/_common_/common.vue
View File

@ -55,44 +55,46 @@ export default defineComponent({
const sideViewHook = inject('sideViewHook', null);
//#region Listen message from SW
navigator.serviceWorker.addEventListener('message', ev => {
if (_DEV_) {
console.log('sw msg', ev.data);
}
if ('serviceWorker' in navigator) {
navigator.serviceWorker.addEventListener('message', ev => {
if (_DEV_) {
console.log('sw msg', ev.data);
}
const data = ev.data as SwMessage;
if (data.type !== 'order') return;
const data = ev.data as SwMessage;
if (data.type !== 'order') return;
if (data.loginId !== $i?.id) {
return getAccountFromId(data.loginId).then(account => {
if (!account) return;
return login(account.token, data.url);
});
}
if (data.loginId !== $i?.id) {
return getAccountFromId(data.loginId).then(account => {
if (!account) return;
return login(account.token, data.url);
});
}
switch (data.order) {
case 'post':
return post(data.options);
case 'push':
if (data.url.startsWith('/my/messaging')) {
if (router.currentRoute.value.path === data.url) return;
if (ColdDeviceStorage.get('chatOpenBehavior') === 'window') return pageWindow(data.url);
if (ColdDeviceStorage.get('chatOpenBehavior') === 'popout') return popout(data.url);
}
if (router.currentRoute.value.path === data.url) {
return window.scroll({ top: 0, behavior: 'smooth' });
}
if (navHook) {
return navHook(data.url);
}
if (sideViewHook && defaultStore.state.defaultSideView && data.url !== '/') {
return sideViewHook(data.url);
}
return router.push(data.url);
default:
return;
}
});
switch (data.order) {
case 'post':
return post(data.options);
case 'push':
if (data.url.startsWith('/my/messaging')) {
if (router.currentRoute.value.path === data.url) return;
if (ColdDeviceStorage.get('chatOpenBehavior') === 'window') return pageWindow(data.url);
if (ColdDeviceStorage.get('chatOpenBehavior') === 'popout') return popout(data.url);
}
if (router.currentRoute.value.path === data.url) {
return window.scroll({ top: 0, behavior: 'smooth' });
}
if (navHook) {
return navHook(data.url);
}
if (sideViewHook && defaultStore.state.defaultSideView && data.url !== '/') {
return sideViewHook(data.url);
}
return router.push(data.url);
default:
return;
}
});
}
}
return {