commit: 9e17be813d093c9337824d9aa78fffe786c8ccc3 parent b7dcb6e97b55869399f3ff23c18dd0fca71e00d0 Author: Henry Jameson <me@hjkos.com> Date: Sun, 22 Dec 2024 16:32:18 +0200 fixed all warnings that show up when just opening the main UIDiffstat:
15 files changed, 45 insertions(+), 17 deletions(-)diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js@@ -97,7 +97,7 @@ const EmojiPicker = { enableStickerPicker: { required: false, type: Boolean, - default: false + default: true }, hideCustomEmoji: { required: false, @@ -105,7 +105,11 @@ const EmojiPicker = { default: false } }, - inject: ['popoversZLayer'], + inject: { + popoversZLayer: { + default: '' + } + }, data () { return { keyword: '',diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue@@ -125,7 +125,7 @@ <NavigationEntry v-if="!forceEditMode && currentUser" :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" /> </ul>diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js@@ -1,11 +1,16 @@ +// routes that take :username property export const USERNAME_ROUTES = new Set([ - 'bookmarks', 'dms', 'interactions', 'notifications', 'chat', - 'chats', - 'user-profile' + 'chats' +]) + +// routes that take :name property +export const NAME_ROUTES = new Set([ + 'user-profile', + 'legacy-user-profile' ]) export const TIMELINES = { @@ -94,7 +99,9 @@ export function routeTo (item, currentUser) { } 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 routediff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue@@ -47,7 +47,6 @@ > <UserAvatar class="post-avatar" - :bot="botIndicator" :compact="true" :better-shadow="betterShadow" :user="notification.from_profile"diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js@@ -53,7 +53,11 @@ const Popover = { default: {} } }, - inject: ['popoversZLayer'], // override popover z layer + inject: { // override popover z layer + popoversZLayer: { + default: '' + } + }, data () { return { // lockReEntry is a flag that is set when mouse cursor is leaving the popover's contentdiff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue@@ -181,10 +181,10 @@ :suggest="emojiUserSuggestor" :placement="emojiPickerPlacement" class="input form-control main-input" + enable-sticker-picker enable-emoji-picker hide-emoji-button :newline-on-ctrl-enter="submitOnEnter" - enable-sticker-picker @input="onEmojiInputInput" @sticker-uploaded="addMediaFile" @sticker-upload-failed="uploadFailed"diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue@@ -2,7 +2,7 @@ <span class="ReactButton"> <EmojiPicker ref="picker" - :enable-sticker-picker="enableStickerPicker" + :enable-sticker-picker="false" :hide-custom-emoji="hideCustomEmoji" class="emoji-picker-panel" @emoji="addReaction"diff --git a/src/components/remove_follower_button/remove_follower_button.vue b/src/components/remove_follower_button/remove_follower_button.vue@@ -17,6 +17,7 @@ @cancelled="hideConfirmRemoveUserFromFollowers" > <i18n-t + scope="global" keypath="user_card.remove_follower_confirm" tag="span" >diff --git a/src/components/settings_modal/settings_modal_admin_content.vue b/src/components/settings_modal/settings_modal_admin_content.vue@@ -17,7 +17,10 @@ <div :label="$t('admin_dash.tabs.nodb')"> <div class="setting-item"> <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> <a href="https://docs-develop.pleroma.social/backend/configuration/howto_database_config/"diff --git a/src/components/settings_modal/tabs/appearance_tab.vue b/src/components/settings_modal/tabs/appearance_tab.vue@@ -164,7 +164,7 @@ <li> <UnitSetting path="textSize" - step="0.1" + :step="0.1" :units="['px', 'rem']" :reset-default="{ 'px': 14, 'rem': 1 }" timed-apply-mode @@ -240,7 +240,7 @@ <li> <UnitSetting path="emojiSize" - step="0.1" + :step="0.1" :units="['px', 'rem']" :reset-default="{ 'px': 32, 'rem': 2.2 }" > @@ -263,7 +263,7 @@ <li> <UnitSetting path="navbarSize" - step="0.1" + :step="0.1" :units="['px', 'rem']" :reset-default="{ 'px': 55, 'rem': 3.5 }" > @@ -274,7 +274,7 @@ <li> <UnitSetting path="panelHeaderSize" - step="0.1" + :step="0.1" :units="['px', 'rem']" :reset-default="{ 'px': 52, 'rem': 3.2 }" timed-apply-modediff --git a/src/components/status/status.vue b/src/components/status/status.vue@@ -386,6 +386,7 @@ class="heading-edited-row" > <i18n-t + scope="global" keypath="status.edited_at" tag="span" >diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js@@ -90,6 +90,9 @@ const StatusContent = { } return true }, + localCollapseSubjectDefault () { + return this.mergedConfig.collapseMessageWithSubject + }, attachmentSize () { if (this.compact) { return 'small'diff --git a/src/components/update_notification/update_notification.vue b/src/components/update_notification/update_notification.vue@@ -34,6 +34,7 @@ class="extra-info-group" > <i18n-t + scope="global" keypath="update.update_bugs" tag="p" > @@ -45,6 +46,7 @@ </template> </i18n-t> <i18n-t + scope="global" keypath="update.update_changelog" tag="p" > @@ -57,6 +59,7 @@ </i18n-t> <p class="art-credit"> <i18n-t + scope="global" keypath="update.art_by" tag="small" >diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue@@ -8,7 +8,7 @@ :style="style" class="background-image" /> - <div :class="onClose ? '' : panel-heading -flexible-height"> + <div :class="onClose ? '' : 'panel-heading -flexible-height'"> <div class="user-info"> <div class="container"> <adiff --git a/src/i18n/en.json b/src/i18n/en.json@@ -1449,6 +1449,9 @@ "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!" }, + "bookmarks": { + "manage_bookmark_folders": "Manage bookmark folders" + }, "lists": { "lists": "Lists", "new": "New List",