This commit is contained in:
Henry Jameson 2022-11-21 22:17:33 +02:00
parent cf294f2d18
commit 3c0e7882b1
9 changed files with 34 additions and 18 deletions

View File

@ -6,9 +6,16 @@
> >
<slot /> <slot />
<!-- TODO: make the 'x' disappear if at the end maybe? --> <!-- TODO: make the 'x' disappear if at the end maybe? -->
<div class="hidden-overlay" :style="overlayStyle" ref="hiddenOverlay"> <div
ref="hiddenOverlay"
class="hidden-overlay"
:style="overlayStyle"
>
<span>{{ preText }}</span> <span>{{ preText }}</span>
<span class="caret" ref="hiddenOverlayCaret">x</span> <span
ref="hiddenOverlayCaret"
class="caret"
>x</span>
<span>{{ postText }}</span> <span>{{ postText }}</span>
</div> </div>
<template v-if="enableEmojiPicker"> <template v-if="enableEmojiPicker">
@ -33,9 +40,9 @@
/> />
</template> </template>
<Popover <Popover
ref="suggestorPopover"
class="autocomplete-panel" class="autocomplete-panel"
placement="bottom" placement="bottom"
ref="suggestorPopover"
> >
<template #content> <template #content>
<div <div

View File

@ -1,8 +1,8 @@
<template> <template>
<Popover <Popover
ref="popover"
trigger="click" trigger="click"
popover-class="emoji-picker popover-default" popover-class="emoji-picker popover-default"
ref="popover"
@show="onPopoverShown" @show="onPopoverShown"
@close="onPopoverClosed" @close="onPopoverClosed"
> >
@ -66,12 +66,12 @@
> >
<div class="emoji-search"> <div class="emoji-search">
<input <input
ref="search"
v-model="keyword" v-model="keyword"
type="text" type="text"
class="form-control" class="form-control"
:placeholder="$t('emoji.search_emoji')" :placeholder="$t('emoji.search_emoji')"
@input="$event.target.composing = false" @input="$event.target.composing = false"
ref="search"
> >
</div> </div>
<div <div

View File

@ -11,7 +11,7 @@
<button <button
class="button-unstyled mobile-nav-button" class="button-unstyled mobile-nav-button"
:title="$t('nav.mobile_sidebar')" :title="$t('nav.mobile_sidebar')"
:aria-expanaded="this.$refs.sideDrawer && !this.$refs.sideDrawer.closed" :aria-expanaded="$refs.sideDrawer && !$refs.sideDrawer.closed"
@click.stop.prevent="toggleMobileSidebar()" @click.stop.prevent="toggleMobileSidebar()"
> >
<FAIcon <FAIcon
@ -79,8 +79,8 @@
</div> </div>
<div <div
id="mobile-notifications" id="mobile-notifications"
class="mobile-notifications"
ref="mobileNotifications" ref="mobileNotifications"
class="mobile-notifications"
@scroll="onScroll" @scroll="onScroll"
/> />
</aside> </aside>

View File

@ -22,8 +22,8 @@
>{{ unseenCount }}</span> >{{ unseenCount }}</span>
</div> </div>
<div <div
class="rightside-button"
v-if="showScrollTop" v-if="showScrollTop"
class="rightside-button"
> >
<button <button
class="button-unstyled scroll-to-top-button" class="button-unstyled scroll-to-top-button"

View File

@ -12,7 +12,10 @@
> >
<slot name="trigger" /> <slot name="trigger" />
</button> </button>
<teleport :disabled="!teleport" to="#popovers"> <teleport
:disabled="!teleport"
to="#popovers"
>
<transition name="fade"> <transition name="fade">
<div <div
v-if="!hidden" v-if="!hidden"

View File

@ -3,7 +3,7 @@
trigger="click" trigger="click"
class="QuickFilterSettings" class="QuickFilterSettings"
:bound-to="{ x: 'container' }" :bound-to="{ x: 'container' }"
:triggerAttrs="{ title: $t('timeline.quick_filter_settings') }" :trigger-attrs="{ title: $t('timeline.quick_filter_settings') }"
> >
<template #content> <template #content>
<div class="dropdown-menu"> <div class="dropdown-menu">

View File

@ -3,7 +3,7 @@
trigger="click" trigger="click"
class="QuickViewSettings" class="QuickViewSettings"
:bound-to="{ x: 'container' }" :bound-to="{ x: 'container' }"
:triggerAttrs="{ title: $t('timeline.quick_view_settings') }" :trigger-attrs="{ title: $t('timeline.quick_view_settings') }"
> >
<template #content> <template #content>
<div class="dropdown-menu"> <div class="dropdown-menu">

View File

@ -83,11 +83,11 @@ const Search = {
this.lastStatusFetchCount = 0 this.lastStatusFetchCount = 0
} }
this.$store.dispatch('search', { q: query, resolve: true, offset: this.statusesOffset, 'type': searchType }) this.$store.dispatch('search', { q: query, resolve: true, offset: this.statusesOffset, type: searchType })
.then(data => { .then(data => {
this.loading = false this.loading = false
let oldLength = this.statuses.length const oldLength = this.statuses.length
// Always append to old results. If new results are empty, this doesn't change anything // Always append to old results. If new results are empty, this doesn't change anything
this.userIds = this.userIds.concat(map(data.accounts, 'id')) this.userIds = this.userIds.concat(map(data.accounts, 'id'))

View File

@ -6,8 +6,8 @@
:timeline-name="timelineName" :timeline-name="timelineName"
/> />
<div <div
class="rightside-button"
v-if="showScrollTop && !embedded" v-if="showScrollTop && !embedded"
class="rightside-button"
> >
<button <button
class="button-unstyled scroll-to-top-button" class="button-unstyled scroll-to-top-button"
@ -26,8 +26,8 @@
</div> </div>
<template v-if="mobileLayout && !embedded"> <template v-if="mobileLayout && !embedded">
<div <div
class="rightside-button"
v-if="showLoadButton" v-if="showLoadButton"
class="rightside-button"
> >
<button <button
class="button-unstyled loadmore-button" class="button-unstyled loadmore-button"
@ -72,8 +72,14 @@
{{ $t('timeline.up_to_date') }} {{ $t('timeline.up_to_date') }}
</div> </div>
</template> </template>
<QuickFilterSettings v-if="!embedded" class="rightside-button"/> <QuickFilterSettings
<QuickViewSettings v-if="!embedded" class="rightside-button"/> v-if="!embedded"
class="rightside-button"
/>
<QuickViewSettings
v-if="!embedded"
class="rightside-button"
/>
</div> </div>
<div :class="classes.body"> <div :class="classes.body">
<div <div