Merge branch 'more-fixes' into shigusegubu-themes3
This commit is contained in:
commit
d73a42f9d8
2 changed files with 6 additions and 10 deletions
|
|
@ -56,18 +56,14 @@
|
|||
<Popover
|
||||
ref="additionalRemotePopover"
|
||||
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"
|
||||
placement="bottom"
|
||||
>
|
||||
<template #trigger>
|
||||
<button
|
||||
class="button button-default emoji-panel-additional-actions"
|
||||
:title="$t('admin_dash.emoji.import_pack')"
|
||||
@click="$refs.additionalRemotePopover.showPopover"
|
||||
>
|
||||
<FAIcon icon="folder-open" />
|
||||
{{ $t('admin_dash.emoji.import_pack_short') }}
|
||||
</button>
|
||||
<FAIcon icon="folder-open" />
|
||||
{{ $t('admin_dash.emoji.import_pack_short') }}
|
||||
</template>
|
||||
|
||||
<template #content>
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ export const useInterfaceStore = defineStore('interface', {
|
|||
messageKey,
|
||||
messageArgs = {},
|
||||
level = 'error',
|
||||
timeout = 0,
|
||||
timeout = 5000,
|
||||
}) {
|
||||
const notice = {
|
||||
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
|
||||
// TODO: Generate UUID or something instead or relying on !== operator?
|
||||
const newNotice = this.globalNotices[this.globalNotices.length - 1]
|
||||
if (timeout) {
|
||||
if (timeout > 0) {
|
||||
setTimeout(() => this.removeGlobalNotice(newNotice), timeout)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue