diff options
| author | Henry Jameson <me@hjkos.com> | 2022-03-17 08:35:19 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-03-17 08:35:19 +0200 |
| commit | be4244acde8183271d3770f2fbbd9d1ac571086b (patch) | |
| tree | fda2d7517b20bd444991a8c22b353fb236f3591d /src/components | |
| parent | 8311d4deba93309dd60ebeb28f7b3ac1d0d23e6c (diff) | |
fix some warnings
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.vue | 2 | ||||
| -rw-r--r-- | src/components/chat/chat.vue | 118 | ||||
| -rw-r--r-- | src/components/checkbox/checkbox.vue | 2 | ||||
| -rw-r--r-- | src/components/desktop_nav/desktop_nav.vue | 2 | ||||
| -rw-r--r-- | src/components/font_control/font_control.js | 2 | ||||
| -rw-r--r-- | src/components/importer/importer.vue | 4 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 |
7 files changed, 65 insertions, 67 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index 53deb1df..eeca7828 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -4,7 +4,7 @@ <UserAvatar class="avatar" :user="user" - @click.prevent.native="toggleUserExpanded" + @click.prevent="toggleUserExpanded" /> </router-link> <div diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue index 94a0097c..493c5d5a 100644 --- a/src/components/chat/chat.vue +++ b/src/components/chat/chat.vue @@ -26,73 +26,71 @@ /> </div> </div> - <template> + <div + ref="scrollable" + class="scrollable-message-list" + :style="{ height: scrollableContainerHeight }" + @scroll="handleScroll" + > + <template v-if="!errorLoadingChat"> + <ChatMessage + v-for="chatViewItem in chatViewItems" + :key="chatViewItem.id" + :author="recipient" + :chat-view-item="chatViewItem" + :hovered-message-chain="chatViewItem.messageChainId === hoveredMessageChainId" + @hover="onMessageHover" + /> + </template> <div - ref="scrollable" - class="scrollable-message-list" - :style="{ height: scrollableContainerHeight }" - @scroll="handleScroll" + v-else + class="chat-loading-error" > - <template v-if="!errorLoadingChat"> - <ChatMessage - v-for="chatViewItem in chatViewItems" - :key="chatViewItem.id" - :author="recipient" - :chat-view-item="chatViewItem" - :hovered-message-chain="chatViewItem.messageChainId === hoveredMessageChainId" - @hover="onMessageHover" - /> - </template> - <div - v-else - class="chat-loading-error" - > - <div class="alert error"> - {{ $t('chats.error_loading_chat') }} - </div> + <div class="alert error"> + {{ $t('chats.error_loading_chat') }} </div> </div> + </div> + <div + ref="footer" + class="panel-body footer" + > <div - ref="footer" - class="panel-body footer" + class="jump-to-bottom-button" + :class="{ 'visible': jumpToBottomButtonVisible }" + @click="scrollDown({ behavior: 'smooth' })" > - <div - class="jump-to-bottom-button" - :class="{ 'visible': jumpToBottomButtonVisible }" - @click="scrollDown({ behavior: 'smooth' })" - > - <span> - <FAIcon icon="chevron-down" /> - <div - v-if="newMessageCount" - class="badge badge-notification unread-chat-count unread-message-count" - > - {{ newMessageCount }} - </div> - </span> - </div> - <PostStatusForm - :disable-subject="true" - :disable-scope-selector="true" - :disable-notice="true" - :disable-lock-warning="true" - :disable-polls="true" - :disable-sensitivity-checkbox="true" - :disable-submit="errorLoadingChat || !currentChat" - :disable-preview="true" - :optimistic-posting="true" - :post-handler="sendMessage" - :submit-on-enter="!mobileLayout" - :preserve-focus="!mobileLayout" - :auto-focus="!mobileLayout" - :placeholder="formPlaceholder" - :file-limit="1" - max-height="160" - emoji-picker-placement="top" - @resize="handleResize" - /> + <span> + <FAIcon icon="chevron-down" /> + <div + v-if="newMessageCount" + class="badge badge-notification unread-chat-count unread-message-count" + > + {{ newMessageCount }} + </div> + </span> </div> - </template> + <PostStatusForm + :disable-subject="true" + :disable-scope-selector="true" + :disable-notice="true" + :disable-lock-warning="true" + :disable-polls="true" + :disable-sensitivity-checkbox="true" + :disable-submit="errorLoadingChat || !currentChat" + :disable-preview="true" + :optimistic-posting="true" + :post-handler="sendMessage" + :submit-on-enter="!mobileLayout" + :preserve-focus="!mobileLayout" + :auto-focus="!mobileLayout" + :placeholder="formPlaceholder" + :file-limit="1" + max-height="160" + emoji-picker-placement="top" + @resize="handleResize" + /> + </div> </div> </div> </div> diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue index d28c2cfd..ff2b4e77 100644 --- a/src/components/checkbox/checkbox.vue +++ b/src/components/checkbox/checkbox.vue @@ -7,7 +7,7 @@ type="checkbox" :disabled="disabled" :checked="checked" - :indeterminate.prop="indeterminate" + :indeterminate="indeterminate" @change="$emit('change', $event.target.checked)" > <i class="checkbox-indicator" /> diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index 304baf9d..bab3ca81 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -34,7 +34,7 @@ <search-bar v-if="currentUser || !privateMode" @toggled="onSearchBarToggled" - @click.stop.native + @click.stop /> <button class="button-unstyled nav-icon" diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js index 137ef9c0..24bad937 100644 --- a/src/components/font_control/font_control.js +++ b/src/components/font_control/font_control.js @@ -1,4 +1,4 @@ -import { set } from 'vue' +import { set } from 'lodash' import Select from '../select/select.vue' export default { diff --git a/src/components/importer/importer.vue b/src/components/importer/importer.vue index 466e15b9..ddc3010e 100644 --- a/src/components/importer/importer.vue +++ b/src/components/importer/importer.vue @@ -25,14 +25,14 @@ icon="times" @click="dismiss" /> - <p>{{ successMessage || $t('importer.success')}}</p> + <p>{{ successMessage || $t('importer.success') }}</p> </div> <div v-else-if="error"> <FAIcon icon="times" @click="dismiss" /> - <p>{{ errorMessage || $t('importer.error')}}</p> + <p>{{ errorMessage || $t('importer.error') }}</p> </div> </div> </template> diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f5b71f54..f778753f 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -123,7 +123,7 @@ > <router-link :to="userProfileLink" - @click.stop.prevent.capture.native="toggleUserExpanded" + @click.stop.prevent.capture="toggleUserExpanded" > <UserAvatar :bot="botIndicator" |
