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

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	README.md
#	locales/en-US.yml
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/core/CustomEmojiService.ts
#	packages/backend/src/core/NoteCreateService.ts
#	packages/backend/src/core/RoleService.ts
#	packages/backend/src/core/activitypub/models/ApNoteService.ts
#	packages/backend/src/core/activitypub/models/ApPersonService.ts
#	packages/backend/src/server/api/endpoints/admin/emoji/update.ts
#	packages/frontend/src/components/MkDialog.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
#	packages/frontend/src/pages/admin/security.vue
#	pnpm-lock.yaml
This commit is contained in:
mattyatea 2024-03-05 16:38:19 +09:00
commit 1947a53af6
215 changed files with 6717 additions and 4288 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/frontend/src/components/MkEmojiPicker.section.vue
View file

@ -16,10 +16,10 @@ SPDX-License-Identifier: AGPL-3.0-only
:key="emoji"
:data-emoji="emoji"
class="_button item"
@pointerenter="computeButtonTitle"
:disabled="disabledEmojis?.value.includes(emoji)"@pointerenter="computeButtonTitle"
@click="emit('chosen', emoji, $event)"
>
<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true":fallbackToImage="true"/>
<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
</button>
</div>
@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only
v-for="emoji in emojis"
:key="emoji"
:data-emoji="emoji"
class="_button item"
class="_button item":disabled="disabledEmojis?.value.includes(emoji)"
@pointerenter="computeButtonTitle"
@click="emit('chosen', emoji, $event)"
>
@ -68,6 +68,7 @@ import MkEmojiPickerSection from '@/components/MkEmojiPicker.section.vue';
const props = defineProps<{
category?: string[];
emojis: string[] | Ref<string[]>;
disabledEmojis?: Ref<string[]>;
initialShown?: boolean;
hasChildSection?: boolean;
customEmojiTree?: CustomEmojiFolderTree[];
@ -83,7 +84,7 @@ const shown = ref(!!props.initialShown);
function computeButtonTitle(ev: MouseEvent): void {
const elm = ev.target as HTMLElement;
const emoji = elm.dataset.emoji as string;
elm.title = getEmojiName(emoji) ?? emoji;
elm.title = getEmojiName(emoji);
}
function nestedChosen(emoji: any, ev?: MouseEvent) {