Merge branch 'lint' into 'develop'
lint See merge request pleroma/pleroma-fe!1686
This commit is contained in:
commit
da94c94fbe
9 changed files with 34 additions and 18 deletions
|
@ -6,9 +6,16 @@
|
|||
>
|
||||
<slot />
|
||||
<!-- 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 class="caret" ref="hiddenOverlayCaret">x</span>
|
||||
<span
|
||||
ref="hiddenOverlayCaret"
|
||||
class="caret"
|
||||
>x</span>
|
||||
<span>{{ postText }}</span>
|
||||
</div>
|
||||
<template v-if="enableEmojiPicker">
|
||||
|
@ -33,9 +40,9 @@
|
|||
/>
|
||||
</template>
|
||||
<Popover
|
||||
ref="suggestorPopover"
|
||||
class="autocomplete-panel"
|
||||
placement="bottom"
|
||||
ref="suggestorPopover"
|
||||
>
|
||||
<template #content>
|
||||
<div
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<template>
|
||||
<Popover
|
||||
ref="popover"
|
||||
trigger="click"
|
||||
popover-class="emoji-picker popover-default"
|
||||
ref="popover"
|
||||
@show="onPopoverShown"
|
||||
@close="onPopoverClosed"
|
||||
>
|
||||
|
@ -66,12 +66,12 @@
|
|||
>
|
||||
<div class="emoji-search">
|
||||
<input
|
||||
ref="search"
|
||||
v-model="keyword"
|
||||
type="text"
|
||||
class="form-control"
|
||||
:placeholder="$t('emoji.search_emoji')"
|
||||
@input="$event.target.composing = false"
|
||||
ref="search"
|
||||
>
|
||||
</div>
|
||||
<div
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<button
|
||||
class="button-unstyled mobile-nav-button"
|
||||
: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()"
|
||||
>
|
||||
<FAIcon
|
||||
|
@ -51,7 +51,7 @@
|
|||
>
|
||||
<div class="mobile-notifications-header">
|
||||
<span class="title">{{ $t('notifications.notifications') }}</span>
|
||||
<span class="spacer"/>
|
||||
<span class="spacer" />
|
||||
<button
|
||||
v-if="notificationsAtTop"
|
||||
class="button-unstyled mobile-nav-button"
|
||||
|
@ -79,8 +79,8 @@
|
|||
</div>
|
||||
<div
|
||||
id="mobile-notifications"
|
||||
class="mobile-notifications"
|
||||
ref="mobileNotifications"
|
||||
class="mobile-notifications"
|
||||
@scroll="onScroll"
|
||||
/>
|
||||
</aside>
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
>{{ unseenCount }}</span>
|
||||
</div>
|
||||
<div
|
||||
class="rightside-button"
|
||||
v-if="showScrollTop"
|
||||
class="rightside-button"
|
||||
>
|
||||
<button
|
||||
class="button-unstyled scroll-to-top-button"
|
||||
|
|
|
@ -12,7 +12,10 @@
|
|||
>
|
||||
<slot name="trigger" />
|
||||
</button>
|
||||
<teleport :disabled="!teleport" to="#popovers">
|
||||
<teleport
|
||||
:disabled="!teleport"
|
||||
to="#popovers"
|
||||
>
|
||||
<transition name="fade">
|
||||
<div
|
||||
v-if="!hidden"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
trigger="click"
|
||||
class="QuickFilterSettings"
|
||||
:bound-to="{ x: 'container' }"
|
||||
:triggerAttrs="{ title: $t('timeline.quick_filter_settings') }"
|
||||
:trigger-attrs="{ title: $t('timeline.quick_filter_settings') }"
|
||||
>
|
||||
<template #content>
|
||||
<div class="dropdown-menu">
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
trigger="click"
|
||||
class="QuickViewSettings"
|
||||
:bound-to="{ x: 'container' }"
|
||||
:triggerAttrs="{ title: $t('timeline.quick_view_settings') }"
|
||||
:trigger-attrs="{ title: $t('timeline.quick_view_settings') }"
|
||||
>
|
||||
<template #content>
|
||||
<div class="dropdown-menu">
|
||||
|
|
|
@ -83,11 +83,11 @@ const Search = {
|
|||
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 => {
|
||||
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
|
||||
this.userIds = this.userIds.concat(map(data.accounts, 'id'))
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
:timeline-name="timelineName"
|
||||
/>
|
||||
<div
|
||||
class="rightside-button"
|
||||
v-if="showScrollTop && !embedded"
|
||||
class="rightside-button"
|
||||
>
|
||||
<button
|
||||
class="button-unstyled scroll-to-top-button"
|
||||
|
@ -26,8 +26,8 @@
|
|||
</div>
|
||||
<template v-if="mobileLayout && !embedded">
|
||||
<div
|
||||
class="rightside-button"
|
||||
v-if="showLoadButton"
|
||||
class="rightside-button"
|
||||
>
|
||||
<button
|
||||
class="button-unstyled loadmore-button"
|
||||
|
@ -72,8 +72,14 @@
|
|||
{{ $t('timeline.up_to_date') }}
|
||||
</div>
|
||||
</template>
|
||||
<QuickFilterSettings v-if="!embedded" class="rightside-button"/>
|
||||
<QuickViewSettings v-if="!embedded" class="rightside-button"/>
|
||||
<QuickFilterSettings
|
||||
v-if="!embedded"
|
||||
class="rightside-button"
|
||||
/>
|
||||
<QuickViewSettings
|
||||
v-if="!embedded"
|
||||
class="rightside-button"
|
||||
/>
|
||||
</div>
|
||||
<div :class="classes.body">
|
||||
<div
|
||||
|
|
Loading…
Reference in a new issue