mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-10-31 05:24:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Fix linting in MkEmojiPicker and custom-emojis in frontend' (#32) from fix-linting-in-emoji-picker-and-custom-emoji into dev
Some checks failed
/ testCommit (push) Has been cancelled
Details

Browse source 
Reviewed-on: https://codeberg.org/yeentown/barkey/pulls/32

Fixes #28
This commit is contained in:
zima 2024-12-22 01:41:38 +00:00
commit da6c59382f
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと --> <!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
<!-- フォルダの中にはカスタム絵文字だけ（Unicode絵文字もこっち） --> <!-- フォルダの中にはカスタム絵文字だけ（Unicode絵文字もこっち） -->
<section v-if="!hasChildSection" :data-shown="shown" v-panel style="border-radius: var(--radius-sm); border-bottom: 0.5px solid var(--divider);"> <section v-if="!hasChildSection" v-panel :data-shown="shown" style="border-radius: var(--radius-sm); border-bottom: 0.5px solid var(--divider);">
<header class="_acrylic" :data-shown="shown" @click="shown = !shown"> <header class="_acrylic" :data-shown="shown" @click="shown = !shown">
<i class="toggle ti-fw" :class="shown ? 'ph-bold ph-caret-down' : 'ph-bold ph-caret-right'"></i> <slot></slot> <i class="toggle ti-fw" :class="shown ? 'ph-bold ph-caret-down' : 'ph-bold ph-caret-right'"></i> <slot></slot>
<span class="emoji-count"><i class="ph-smiley ph-bold ph-lg"></i> {{ emojis.length }}</span> <span class="emoji-count"><i class="ph-smiley ph-bold ph-lg"></i> {{ emojis.length }}</span>
@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<header class="_acrylic" :data-shown="shown" @click="shown = !shown"> <header class="_acrylic" :data-shown="shown" @click="shown = !shown">
<i class="toggle ti-fw" :class="shown ? 'ph-bold ph-caret-down' : 'ph-bold ph-caret-right'"></i> <slot></slot> <i class="toggle ti-fw" :class="shown ? 'ph-bold ph-caret-down' : 'ph-bold ph-caret-right'"></i> <slot></slot>
<span class="emoji-count"><i class="ph-folder ph-bold"></i> {{ customEmojiTree?.length }}</span> <span class="emoji-count"><i class="ph-folder ph-bold"></i> {{ customEmojiTree?.length }}</span>
<span class="emoji-count" v-if="emojis.length > 0"><i class="ph-smiley ph-bold"></i> {{ emojis.length }}</span> <span v-if="emojis.length > 0" class="emoji-count"><i class="ph-smiley ph-bold"></i> {{ emojis.length }}</span>
</header> </header>
<div v-if="shown" style="padding-left: 9px;"> <div v-if="shown" style="padding-left: 9px;">
<MkEmojiPickerSection <MkEmojiPickerSection

9
packages/frontend/src/custom-emojis.ts
View file

@ -22,14 +22,11 @@ export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
export function compareBySortKey(a: Misskey.entities.EmojiSimple, b: Misskey.entities.EmojiSimple): number { export function compareBySortKey(a: Misskey.entities.EmojiSimple, b: Misskey.entities.EmojiSimple): number {
if (a.sortKey === b.sortKey) { if (a.sortKey === b.sortKey) {
if (a.name === b.name) if (a.name === b.name) return 0;
return 0;
return (a.name > b.name) ? 1 : -1; return (a.name > b.name) ? 1 : -1;
} }
if (a.sortKey === null) if (a.sortKey === null) return 1;
return 1; if (b.sortKey === null) return -1;
if (b.sortKey === null)
return -1;
return (a.sortKey > b.sortKey) ? 1 : -1; return (a.sortKey > b.sortKey) ? 1 : -1;
} }