Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sw-notification-action

Browse source
This commit is contained in:
tamaina 2021-03-23 21:25:39 +09:00
commit f2b5118bda
783 changed files with 5464 additions and 3649 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/client/ui/_common_/common.vue
View file

@ -15,14 +15,14 @@
<script lang="ts">
import { defineAsyncComponent, defineComponent, inject } from 'vue';
import { stream, popup, popups, uploads, pendingApiRequestsCount, pageWindow, post } from '@/os';
import * as sound from '@/scripts/sound';
import { $i, login } from '@/account';
import { SwMessage } from '@/sw/types';
import { popout } from '@/scripts/popout';
import { defaultStore, ColdDeviceStorage } from '@/store';
import { getAccountFromId } from '@/scripts/get-account-from-id';
import { router } from '@/router';
import { stream, popup, popups, uploads, pendingApiRequestsCount, pageWindow, post } from '@client/os';
import * as sound from '@client/scripts/sound';
import { $i, login } from '@client/account';
import { SwMessage } from '@client/sw/types';
import { popout } from '@client/scripts/popout';
import { defaultStore, ColdDeviceStorage } from '@client/store';
import { getAccountFromId } from '@client/scripts/get-account-from-id';
import { router } from '@client/router';
export default defineComponent({
components: {
@ -39,7 +39,7 @@ export default defineComponent({
id: notification.id
});
popup(import('@/components/toast.vue'), {
popup(import('@client/components/toast.vue'), {
notification
}, {}, 'closed');
}