hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'more-fixes' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-06-30 15:29:51 +03:00
commit d73a42f9d8
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/settings_modal/admin_tabs/emoji_tab.vue
View file

@ -56,18 +56,14 @@
<Popover <Popover
ref="additionalRemotePopover" ref="additionalRemotePopover"
popover-class="emoji-tab-edit-popover popover-default" popover-class="emoji-tab-edit-popover popover-default"
class="button button-default emoji-panel-additional-actions"
:title="$t('admin_dash.emoji.import_pack')"
trigger="click" trigger="click"
placement="bottom" placement="bottom"
> >
<template #trigger> <template #trigger>
<button <FAIcon icon="folder-open" />
class="button button-default emoji-panel-additional-actions" {{ $t('admin_dash.emoji.import_pack_short') }}
:title="$t('admin_dash.emoji.import_pack')"
@click="$refs.additionalRemotePopover.showPopover"
>
<FAIcon icon="folder-open" />
{{ $t('admin_dash.emoji.import_pack_short') }}
</button>
</template> </template>
<template #content> <template #content>

4
src/stores/interface.js
View file

@ -205,7 +205,7 @@ export const useInterfaceStore = defineStore('interface', {
messageKey, messageKey,
messageArgs = {}, messageArgs = {},
level = 'error', level = 'error',
timeout = 0, timeout = 5000,
}) { }) {
const notice = { const notice = {
messageKey, messageKey,
@ -218,7 +218,7 @@ export const useInterfaceStore = defineStore('interface', {
// Adding a new element to array wraps it in a Proxy, which breaks the comparison // Adding a new element to array wraps it in a Proxy, which breaks the comparison
// TODO: Generate UUID or something instead or relying on !== operator? // TODO: Generate UUID or something instead or relying on !== operator?
const newNotice = this.globalNotices[this.globalNotices.length - 1] const newNotice = this.globalNotices[this.globalNotices.length - 1]
if (timeout) { if (timeout > 0) {
setTimeout(() => this.removeGlobalNotice(newNotice), timeout) setTimeout(() => this.removeGlobalNotice(newNotice), timeout)
} }