summaryrefslogtreecommitdiff
path: root/packages/frontend/src/ui/_common_
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-04-01 13:42:40 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-04-01 13:42:40 +0900
commitc823cbe63b30d622d240adb92b696d0f507d084d (patch)
tree1d2dadb135abd92e02b04281fd6224b4b1376054 /packages/frontend/src/ui/_common_
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadmisskey-c823cbe63b30d622d240adb92b696d0f507d084d.tar.gz
misskey-c823cbe63b30d622d240adb92b696d0f507d084d.tar.bz2
misskey-c823cbe63b30d622d240adb92b696d0f507d084d.zip
refactor(frontend): remove $store
Diffstat (limited to 'packages/frontend/src/ui/_common_')
-rw-r--r--packages/frontend/src/ui/_common_/common.vue11
-rw-r--r--packages/frontend/src/ui/_common_/stream-indicator.vue3
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/frontend/src/ui/_common_/common.vue b/packages/frontend/src/ui/_common_/common.vue
index 976345f9ee..e1561cb396 100644
--- a/packages/frontend/src/ui/_common_/common.vue
+++ b/packages/frontend/src/ui/_common_/common.vue
@@ -11,11 +11,11 @@
<TransitionGroup
tag="div" :class="$style.notifications"
- :move-class="$store.state.animation ? $style.transition_notification_move : ''"
- :enter-active-class="$store.state.animation ? $style.transition_notification_enterActive : ''"
- :leave-active-class="$store.state.animation ? $style.transition_notification_leaveActive : ''"
- :enter-from-class="$store.state.animation ? $style.transition_notification_enterFrom : ''"
- :leave-to-class="$store.state.animation ? $style.transition_notification_leaveTo : ''"
+ :move-class="defaultStore.state.animation ? $style.transition_notification_move : ''"
+ :enter-active-class="defaultStore.state.animation ? $style.transition_notification_enterActive : ''"
+ :leave-active-class="defaultStore.state.animation ? $style.transition_notification_leaveActive : ''"
+ :enter-from-class="defaultStore.state.animation ? $style.transition_notification_enterFrom : ''"
+ :leave-to-class="defaultStore.state.animation ? $style.transition_notification_leaveTo : ''"
>
<XNotification v-for="notification in notifications" :key="notification.id" :notification="notification" :class="$style.notification"/>
</TransitionGroup>
@@ -40,6 +40,7 @@ import * as sound from '@/scripts/sound';
import { $i } from '@/account';
import { stream } from '@/stream';
import { i18n } from '@/i18n';
+import { defaultStore } from '@/store';
const XStreamIndicator = defineAsyncComponent(() => import('./stream-indicator.vue'));
const XUpload = defineAsyncComponent(() => import('./upload.vue'));
diff --git a/packages/frontend/src/ui/_common_/stream-indicator.vue b/packages/frontend/src/ui/_common_/stream-indicator.vue
index b46422d6cd..2a856e2a45 100644
--- a/packages/frontend/src/ui/_common_/stream-indicator.vue
+++ b/packages/frontend/src/ui/_common_/stream-indicator.vue
@@ -1,5 +1,5 @@
<template>
-<div v-if="hasDisconnected && $store.state.serverDisconnectedBehavior === 'quiet'" :class="$style.root" class="_panel _shadow" @click="resetDisconnected">
+<div v-if="hasDisconnected && defaultStore.state.serverDisconnectedBehavior === 'quiet'" :class="$style.root" class="_panel _shadow" @click="resetDisconnected">
<div><i class="ti ti-alert-triangle"></i> {{ i18n.ts.disconnectedFromServer }}</div>
<div :class="$style.command" class="_buttons">
<MkButton :class="$style.commandButton" small primary @click="reload">{{ i18n.ts.reload }}</MkButton>
@@ -14,6 +14,7 @@ import { stream } from '@/stream';
import { i18n } from '@/i18n';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os';
+import { defaultStore } from '@/store';
const zIndex = os.claimZIndex('high');