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

fix merge failure

This commit is contained in:
kakkokari-gtyih 2025-03-16 14:22:50 +09:00
parent ea7b27f912
commit 72abb25f04
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/frontend/src/pages/settings/emoji-palette.vue
View File

@ -100,8 +100,19 @@ SPDX-License-Identifier: AGPL-3.0-only
<SearchMarker :keywords="['emoji', 'picker', 'style']"> <SearchMarker :keywords="['emoji', 'picker', 'style']">
<MkPreferenceContainer k="emojiPickerStyle"> <MkPreferenceContainer k="emojiPickerStyle">
<MkSelect v-model="emojiPickerStyle"> <MkSelect v-model="emojiPickerStyle">
<template #label><SearchLabel>{{ i18n.ts.style }}</SearchLabel></template> <template #label><SearchLabel>{{ i18n.ts.style }} ({{ i18n.ts.emojiPicker }})</SearchLabel></template>
<template #caption>{{ i18n.ts.needReloadToApply }}</template> <option value="auto">{{ i18n.ts.auto }}</option>
<option value="popup">{{ i18n.ts.popup }}</option>
<option value="drawer">{{ i18n.ts.drawer }}</option>
<option value="window">{{ i18n.ts.window }}</option>
</MkSelect>
</MkPreferenceContainer>
</SearchMarker>
<SearchMarker :keywords="['reaction', 'emoji', 'picker', 'style']">
<MkPreferenceContainer k="emojiPickerStyle">
<MkSelect v-model="emojiPickerStyle">
<template #label><SearchLabel>{{ i18n.ts.style }} ({{ i18n.ts.reactionPicker }})</SearchLabel></template>
<option value="auto">{{ i18n.ts.auto }}</option> <option value="auto">{{ i18n.ts.auto }}</option>
<option value="popup">{{ i18n.ts.popup }}</option> <option value="popup">{{ i18n.ts.popup }}</option>
<option value="drawer">{{ i18n.ts.drawer }}</option> <option value="drawer">{{ i18n.ts.drawer }}</option>
@ -133,13 +144,14 @@ import { prefer } from '@/preferences.js';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue'; import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
import MkSwitch from '@/components/MkSwitch.vue'; import MkSwitch from '@/components/MkSwitch.vue';
import { emojiPicker } from '@/utility/emoji-picker.js'; import { emojiPicker } from '@/utility/emoji-picker.js';
import { reloadAsk } from '@/scripts/reload-ask.js';
const emojiPaletteForReaction = prefer.model('emojiPaletteForReaction'); const emojiPaletteForReaction = prefer.model('emojiPaletteForReaction');
const emojiPaletteForMain = prefer.model('emojiPaletteForMain'); const emojiPaletteForMain = prefer.model('emojiPaletteForMain');
const emojiPickerScale = prefer.model('emojiPickerScale'); const emojiPickerScale = prefer.model('emojiPickerScale');
const emojiPickerWidth = prefer.model('emojiPickerWidth'); const emojiPickerWidth = prefer.model('emojiPickerWidth');
const emojiPickerHeight = prefer.model('emojiPickerHeight'); const emojiPickerHeight = prefer.model('emojiPickerHeight');
const emojiPickerStyle = prefer.model('emojiPickerStyle'); const emojiPickerStyle = prefer.model('emojiPickerStyle');
const reactionPickerStyle = prefer.model('reactionPickerStyle');
const palettesSyncEnabled = ref(prefer.isSyncEnabled('emojiPalettes')); const palettesSyncEnabled = ref(prefer.isSyncEnabled('emojiPalettes'));
@ -214,6 +226,13 @@ function previewPicker(ev: MouseEvent) {
emojiPicker.show(getHTMLElement(ev)); emojiPicker.show(getHTMLElement(ev));
} }
watch([
emojiPickerStyle,
reactionPickerStyle,
], async () => {
await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
});
definePage(() => ({ definePage(() => ({
title: i18n.ts.emojiPalette, title: i18n.ts.emojiPalette,
icon: 'ti ti-mood-happy', icon: 'ti ti-mood-happy',

5
packages/frontend/src/utility/autogen/settings-search-index.ts
View File

@ -669,6 +669,11 @@ export const searchIndexes: SearchIndexItem[] = [
label: i18n.ts.style, label: i18n.ts.style,
keywords: ['emoji', 'picker', 'style'], keywords: ['emoji', 'picker', 'style'],
}, },
{
id: '1AcH5eI7H',
label: i18n.ts.style,
keywords: ['reaction', 'emoji', 'picker', 'style'],
},
], ],
label: i18n.ts.emojiPickerDisplay, label: i18n.ts.emojiPickerDisplay,
keywords: ['emoji', 'picker', 'display'], keywords: ['emoji', 'picker', 'display'],