From 4c135a5ca12c5e0efc343425905b995ecb0a5a90 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Sun, 10 Dec 2023 02:11:17 +0900
Subject: [PATCH] Fix indentation (#12615)
---
.../src/components/MkEmojiPicker.section.vue | 58 ++++++++--------
.../frontend/src/components/MkEmojiPicker.vue | 22 +++----
packages/frontend/src/pages/admin-user.vue | 66 +++++++++----------
.../frontend/src/pages/settings/general.vue | 2 +-
4 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 35de9bbb5e..14f3f5770f 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -26,35 +26,35 @@ SPDX-License-Identifier: AGPL-3.0-only
</section>
<!-- フォルダの中にはカスタム絵文字やフォルダがある -->
<section v-else v-panel style="border-radius: 6px; border-bottom: 0.5px solid var(--divider);">
- <header class="_acrylic" @click="shown = !shown">
- <i class="toggle ti-fw" :class="shown ? 'ti ti-chevron-down' : 'ti ti-chevron-up'"></i> <slot></slot> (<i class="ti ti-folder ti-fw"></i>:{{ customEmojiTree.length }} <i class="ti ti-icons ti-fw"></i>:{{ emojis.length }})
- </header>
- <div v-if="shown" style="padding-left: 9px;">
- <MkEmojiPickerSection
- v-for="child in customEmojiTree"
- :key="`custom:${child.value}`"
- :initialShown="initialShown"
- :emojis="computed(() => customEmojis.filter(e => e.category === child.category).map(e => `:${e.name}:`))"
- :hasChildSection="child.children.length !== 0"
- :customEmojiTree="child.children"
- @chosen="nestedChosen"
- >
- {{ child.value || i18n.ts.other }}
- </MkEmojiPickerSection>
- </div>
- <div v-if="shown" class="body">
- <button
- v-for="emoji in emojis"
- :key="emoji"
- :data-emoji="emoji"
- class="_button item"
- @pointerenter="computeButtonTitle"
- @click="emit('chosen', emoji, $event)"
- >
- <MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
- <MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
- </button>
- </div>
+ <header class="_acrylic" @click="shown = !shown">
+ <i class="toggle ti-fw" :class="shown ? 'ti ti-chevron-down' : 'ti ti-chevron-up'"></i> <slot></slot> (<i class="ti ti-folder ti-fw"></i>:{{ customEmojiTree.length }} <i class="ti ti-icons ti-fw"></i>:{{ emojis.length }})
+ </header>
+ <div v-if="shown" style="padding-left: 9px;">
+ <MkEmojiPickerSection
+ v-for="child in customEmojiTree"
+ :key="`custom:${child.value}`"
+ :initialShown="initialShown"
+ :emojis="computed(() => customEmojis.filter(e => e.category === child.category).map(e => `:${e.name}:`))"
+ :hasChildSection="child.children.length !== 0"
+ :customEmojiTree="child.children"
+ @chosen="nestedChosen"
+ >
+ {{ child.value || i18n.ts.other }}
+ </MkEmojiPickerSection>
+ </div>
+ <div v-if="shown" class="body">
+ <button
+ v-for="emoji in emojis"
+ :key="emoji"
+ :data-emoji="emoji"
+ class="_button item"
+ @pointerenter="computeButtonTitle"
+ @click="emit('chosen', emoji, $event)"
+ >
+ <MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+ <MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
+ </button>
+ </div>
</section>
</template>
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index b5e5a0260c..29a33a162f 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -77,8 +77,8 @@ SPDX-License-Identifier: AGPL-3.0-only
:key="`custom:${child.value}`"
:initialShown="false"
:emojis="computed(() => customEmojis.filter(e => child.value === '' ? (e.category === 'null' || !e.category) : e.category === child.value).filter(filterAvailable).map(e => `:${e.name}:`))"
- :hasChildSection="child.children.length !== 0"
- :customEmojiTree="child.children"
+ :hasChildSection="child.children.length !== 0"
+ :customEmojiTree="child.children"
@chosen="chosen"
>
{{ child.value || i18n.ts.other }}
@@ -103,12 +103,12 @@ import { ref, shallowRef, computed, watch, onMounted } from 'vue';
import * as Misskey from 'misskey-js';
import XSection from '@/components/MkEmojiPicker.section.vue';
import {
- emojilist,
- emojiCharByCategory,
- UnicodeEmojiDef,
- unicodeEmojiCategories as categories,
- getEmojiName,
- CustomEmojiFolderTree
+ emojilist,
+ emojiCharByCategory,
+ UnicodeEmojiDef,
+ unicodeEmojiCategories as categories,
+ getEmojiName,
+ CustomEmojiFolderTree
} from '@/scripts/emojilist.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
import * as os from '@/os.js';
@@ -176,9 +176,9 @@ function parseAndMergeCategories(input: string, root: CustomEmojiFolderTree): Cu
}
customEmojiCategories.value.forEach(ec => {
- if (ec !== null) {
- parseAndMergeCategories(ec, customEmojiFolderRoot);
- }
+ if (ec !== null) {
+ parseAndMergeCategories(ec, customEmojiFolderRoot);
+ }
});
parseAndMergeCategories('', customEmojiFolderRoot);
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index fd839b4369..55ad1e2ab1 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -122,7 +122,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
</MkFolder>
- <div>
+ <div>
<MkButton v-if="iAmModerator" inline danger style="margin-right: 8px;" @click="unsetUserAvatar"><i class="ti ti-user-circle"></i> {{ i18n.ts.unsetUserAvatar }}</MkButton>
<MkButton v-if="iAmModerator" inline danger @click="unsetUserBanner"><i class="ti ti-photo"></i> {{ i18n.ts.unsetUserBanner }}</MkButton>
</div>
@@ -325,41 +325,41 @@ async function toggleSuspend(v) {
}
async function unsetUserAvatar() {
- const confirm = await os.confirm({
- type: 'warning',
- text: i18n.ts.unsetUserAvatarConfirm,
- });
- if (confirm.canceled) return;
- const process = async () => {
- await os.api('admin/unset-user-avatar', { userId: user.value.id });
- os.success();
- };
- await process().catch(err => {
- os.alert({
- type: 'error',
- text: err.toString(),
- });
- });
- refreshUser();
+ const confirm = await os.confirm({
+ type: 'warning',
+ text: i18n.ts.unsetUserAvatarConfirm,
+ });
+ if (confirm.canceled) return;
+ const process = async () => {
+ await os.api('admin/unset-user-avatar', { userId: user.value.id });
+ os.success();
+ };
+ await process().catch(err => {
+ os.alert({
+ type: 'error',
+ text: err.toString(),
+ });
+ });
+ refreshUser();
}
async function unsetUserBanner() {
- const confirm = await os.confirm({
- type: 'warning',
- text: i18n.ts.unsetUserBannerConfirm,
- });
- if (confirm.canceled) return;
- const process = async () => {
- await os.api('admin/unset-user-banner', { userId: user.value.id });
- os.success();
- };
- await process().catch(err => {
- os.alert({
- type: 'error',
- text: err.toString(),
- });
- });
- refreshUser();
+ const confirm = await os.confirm({
+ type: 'warning',
+ text: i18n.ts.unsetUserBannerConfirm,
+ });
+ if (confirm.canceled) return;
+ const process = async () => {
+ await os.api('admin/unset-user-banner', { userId: user.value.id });
+ os.success();
+ };
+ await process().catch(err => {
+ os.alert({
+ type: 'error',
+ text: err.toString(),
+ });
+ });
+ refreshUser();
}
async function deleteAllFiles() {
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 98a07d907d..0c83abf7f6 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -293,7 +293,7 @@ const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroup
watch(lang, () => {
miLocalStorage.setItem('lang', lang.value as string);
miLocalStorage.removeItem('locale');
- miLocalStorage.removeItem('localeVersion');
+ miLocalStorage.removeItem('localeVersion');
});
watch(fontSize, () => {