fixed all warnings that show up when just opening the main UI
This commit is contained in:
parent
b7dcb6e97b
commit
9e17be813d
|
@ -97,7 +97,7 @@ const EmojiPicker = {
|
||||||
enableStickerPicker: {
|
enableStickerPicker: {
|
||||||
required: false,
|
required: false,
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: true
|
||||||
},
|
},
|
||||||
hideCustomEmoji: {
|
hideCustomEmoji: {
|
||||||
required: false,
|
required: false,
|
||||||
|
@ -105,7 +105,11 @@ const EmojiPicker = {
|
||||||
default: false
|
default: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
inject: ['popoversZLayer'],
|
inject: {
|
||||||
|
popoversZLayer: {
|
||||||
|
default: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
keyword: '',
|
keyword: '',
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
<NavigationEntry
|
<NavigationEntry
|
||||||
v-if="!forceEditMode && currentUser"
|
v-if="!forceEditMode && currentUser"
|
||||||
:show-pin="false"
|
:show-pin="false"
|
||||||
:item="{ label: editMode ? $t('nav.edit_finish') : $t('nav.edit_pinned'), icon: editMode ? 'check' : 'wrench' }"
|
:item="{ labelRaw: editMode ? $t('nav.edit_finish') : $t('nav.edit_pinned'), icon: editMode ? 'check' : 'wrench' }"
|
||||||
@click="toggleEditMode"
|
@click="toggleEditMode"
|
||||||
/>
|
/>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
|
// routes that take :username property
|
||||||
export const USERNAME_ROUTES = new Set([
|
export const USERNAME_ROUTES = new Set([
|
||||||
'bookmarks',
|
|
||||||
'dms',
|
'dms',
|
||||||
'interactions',
|
'interactions',
|
||||||
'notifications',
|
'notifications',
|
||||||
'chat',
|
'chat',
|
||||||
'chats',
|
'chats'
|
||||||
'user-profile'
|
])
|
||||||
|
|
||||||
|
// routes that take :name property
|
||||||
|
export const NAME_ROUTES = new Set([
|
||||||
|
'user-profile',
|
||||||
|
'legacy-user-profile'
|
||||||
])
|
])
|
||||||
|
|
||||||
export const TIMELINES = {
|
export const TIMELINES = {
|
||||||
|
@ -94,7 +99,9 @@ export function routeTo (item, currentUser) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (USERNAME_ROUTES.has(route.name)) {
|
if (USERNAME_ROUTES.has(route.name)) {
|
||||||
route.params = { username: currentUser.screen_name, name: currentUser.screen_name }
|
route.params = { username: currentUser.screen_name }
|
||||||
|
} else if (NAME_ROUTES.has(route.name)) {
|
||||||
|
route.params = { name: currentUser.screen_name }
|
||||||
}
|
}
|
||||||
|
|
||||||
return route
|
return route
|
||||||
|
|
|
@ -47,7 +47,6 @@
|
||||||
>
|
>
|
||||||
<UserAvatar
|
<UserAvatar
|
||||||
class="post-avatar"
|
class="post-avatar"
|
||||||
:bot="botIndicator"
|
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:better-shadow="betterShadow"
|
:better-shadow="betterShadow"
|
||||||
:user="notification.from_profile"
|
:user="notification.from_profile"
|
||||||
|
|
|
@ -53,7 +53,11 @@ const Popover = {
|
||||||
default: {}
|
default: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
inject: ['popoversZLayer'], // override popover z layer
|
inject: { // override popover z layer
|
||||||
|
popoversZLayer: {
|
||||||
|
default: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
// lockReEntry is a flag that is set when mouse cursor is leaving the popover's content
|
// lockReEntry is a flag that is set when mouse cursor is leaving the popover's content
|
||||||
|
|
|
@ -181,10 +181,10 @@
|
||||||
:suggest="emojiUserSuggestor"
|
:suggest="emojiUserSuggestor"
|
||||||
:placement="emojiPickerPlacement"
|
:placement="emojiPickerPlacement"
|
||||||
class="input form-control main-input"
|
class="input form-control main-input"
|
||||||
|
enable-sticker-picker
|
||||||
enable-emoji-picker
|
enable-emoji-picker
|
||||||
hide-emoji-button
|
hide-emoji-button
|
||||||
:newline-on-ctrl-enter="submitOnEnter"
|
:newline-on-ctrl-enter="submitOnEnter"
|
||||||
enable-sticker-picker
|
|
||||||
@input="onEmojiInputInput"
|
@input="onEmojiInputInput"
|
||||||
@sticker-uploaded="addMediaFile"
|
@sticker-uploaded="addMediaFile"
|
||||||
@sticker-upload-failed="uploadFailed"
|
@sticker-upload-failed="uploadFailed"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<span class="ReactButton">
|
<span class="ReactButton">
|
||||||
<EmojiPicker
|
<EmojiPicker
|
||||||
ref="picker"
|
ref="picker"
|
||||||
:enable-sticker-picker="enableStickerPicker"
|
:enable-sticker-picker="false"
|
||||||
:hide-custom-emoji="hideCustomEmoji"
|
:hide-custom-emoji="hideCustomEmoji"
|
||||||
class="emoji-picker-panel"
|
class="emoji-picker-panel"
|
||||||
@emoji="addReaction"
|
@emoji="addReaction"
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
@cancelled="hideConfirmRemoveUserFromFollowers"
|
@cancelled="hideConfirmRemoveUserFromFollowers"
|
||||||
>
|
>
|
||||||
<i18n-t
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
keypath="user_card.remove_follower_confirm"
|
keypath="user_card.remove_follower_confirm"
|
||||||
tag="span"
|
tag="span"
|
||||||
>
|
>
|
||||||
|
|
|
@ -17,7 +17,10 @@
|
||||||
<div :label="$t('admin_dash.tabs.nodb')">
|
<div :label="$t('admin_dash.tabs.nodb')">
|
||||||
<div class="setting-item">
|
<div class="setting-item">
|
||||||
<h2>{{ $t('admin_dash.nodb.heading') }}</h2>
|
<h2>{{ $t('admin_dash.nodb.heading') }}</h2>
|
||||||
<i18n-t keypath="admin_dash.nodb.text">
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
|
keypath="admin_dash.nodb.text"
|
||||||
|
>
|
||||||
<template #documentation>
|
<template #documentation>
|
||||||
<a
|
<a
|
||||||
href="https://docs-develop.pleroma.social/backend/configuration/howto_database_config/"
|
href="https://docs-develop.pleroma.social/backend/configuration/howto_database_config/"
|
||||||
|
|
|
@ -164,7 +164,7 @@
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
path="textSize"
|
path="textSize"
|
||||||
step="0.1"
|
:step="0.1"
|
||||||
:units="['px', 'rem']"
|
:units="['px', 'rem']"
|
||||||
:reset-default="{ 'px': 14, 'rem': 1 }"
|
:reset-default="{ 'px': 14, 'rem': 1 }"
|
||||||
timed-apply-mode
|
timed-apply-mode
|
||||||
|
@ -240,7 +240,7 @@
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
path="emojiSize"
|
path="emojiSize"
|
||||||
step="0.1"
|
:step="0.1"
|
||||||
:units="['px', 'rem']"
|
:units="['px', 'rem']"
|
||||||
:reset-default="{ 'px': 32, 'rem': 2.2 }"
|
:reset-default="{ 'px': 32, 'rem': 2.2 }"
|
||||||
>
|
>
|
||||||
|
@ -263,7 +263,7 @@
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
path="navbarSize"
|
path="navbarSize"
|
||||||
step="0.1"
|
:step="0.1"
|
||||||
:units="['px', 'rem']"
|
:units="['px', 'rem']"
|
||||||
:reset-default="{ 'px': 55, 'rem': 3.5 }"
|
:reset-default="{ 'px': 55, 'rem': 3.5 }"
|
||||||
>
|
>
|
||||||
|
@ -274,7 +274,7 @@
|
||||||
<li>
|
<li>
|
||||||
<UnitSetting
|
<UnitSetting
|
||||||
path="panelHeaderSize"
|
path="panelHeaderSize"
|
||||||
step="0.1"
|
:step="0.1"
|
||||||
:units="['px', 'rem']"
|
:units="['px', 'rem']"
|
||||||
:reset-default="{ 'px': 52, 'rem': 3.2 }"
|
:reset-default="{ 'px': 52, 'rem': 3.2 }"
|
||||||
timed-apply-mode
|
timed-apply-mode
|
||||||
|
|
|
@ -386,6 +386,7 @@
|
||||||
class="heading-edited-row"
|
class="heading-edited-row"
|
||||||
>
|
>
|
||||||
<i18n-t
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
keypath="status.edited_at"
|
keypath="status.edited_at"
|
||||||
tag="span"
|
tag="span"
|
||||||
>
|
>
|
||||||
|
|
|
@ -90,6 +90,9 @@ const StatusContent = {
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
|
localCollapseSubjectDefault () {
|
||||||
|
return this.mergedConfig.collapseMessageWithSubject
|
||||||
|
},
|
||||||
attachmentSize () {
|
attachmentSize () {
|
||||||
if (this.compact) {
|
if (this.compact) {
|
||||||
return 'small'
|
return 'small'
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
class="extra-info-group"
|
class="extra-info-group"
|
||||||
>
|
>
|
||||||
<i18n-t
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
keypath="update.update_bugs"
|
keypath="update.update_bugs"
|
||||||
tag="p"
|
tag="p"
|
||||||
>
|
>
|
||||||
|
@ -45,6 +46,7 @@
|
||||||
</template>
|
</template>
|
||||||
</i18n-t>
|
</i18n-t>
|
||||||
<i18n-t
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
keypath="update.update_changelog"
|
keypath="update.update_changelog"
|
||||||
tag="p"
|
tag="p"
|
||||||
>
|
>
|
||||||
|
@ -57,6 +59,7 @@
|
||||||
</i18n-t>
|
</i18n-t>
|
||||||
<p class="art-credit">
|
<p class="art-credit">
|
||||||
<i18n-t
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
keypath="update.art_by"
|
keypath="update.art_by"
|
||||||
tag="small"
|
tag="small"
|
||||||
>
|
>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
:style="style"
|
:style="style"
|
||||||
class="background-image"
|
class="background-image"
|
||||||
/>
|
/>
|
||||||
<div :class="onClose ? '' : panel-heading -flexible-height">
|
<div :class="onClose ? '' : 'panel-heading -flexible-height'">
|
||||||
<div class="user-info">
|
<div class="user-info">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<a
|
<a
|
||||||
|
|
|
@ -1449,6 +1449,9 @@
|
||||||
"error_sending_message": "Something went wrong when sending the message.",
|
"error_sending_message": "Something went wrong when sending the message.",
|
||||||
"empty_chat_list_placeholder": "You don't have any chats yet. Start a new chat!"
|
"empty_chat_list_placeholder": "You don't have any chats yet. Start a new chat!"
|
||||||
},
|
},
|
||||||
|
"bookmarks": {
|
||||||
|
"manage_bookmark_folders": "Manage bookmark folders"
|
||||||
|
},
|
||||||
"lists": {
|
"lists": {
|
||||||
"lists": "Lists",
|
"lists": "Lists",
|
||||||
"new": "New List",
|
"new": "New List",
|
||||||
|
|
Loading…
Reference in a new issue