From 905b9771ec74c4c79e5795676ea9c3946e586ce9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 25 Apr 2021 13:24:08 +0300
Subject: stop using vue.set

---
 src/components/font_control/font_control.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/components/font_control/font_control.js')

diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 6274780b..d3e4680f 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -1,4 +1,3 @@
-import { set } from 'vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChevronDown
@@ -40,8 +39,8 @@ export default {
         return this.dValue.family
       },
       set (v) {
-        set(this.lValue, 'family', v)
-        this.$emit('input', this.lValue)
+        this.lValue.family = v
+        this.$emit('update:modelValue', this.lValue)
       }
     },
     isCustom () {
-- 
cgit v1.2.3-70-g09d2


From be4244acde8183271d3770f2fbbd9d1ac571086b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Mar 2022 08:35:19 +0200
Subject: fix some warnings

---
 src/App.vue                                        |   2 +-
 src/components/basic_user_card/basic_user_card.vue |   2 +-
 src/components/chat/chat.vue                       | 118 ++++++++++-----------
 src/components/checkbox/checkbox.vue               |   2 +-
 src/components/desktop_nav/desktop_nav.vue         |   2 +-
 src/components/font_control/font_control.js        |   2 +-
 src/components/importer/importer.vue               |   4 +-
 src/components/status/status.vue                   |   2 +-
 8 files changed, 66 insertions(+), 68 deletions(-)

(limited to 'src/components/font_control/font_control.js')

diff --git a/src/App.vue b/src/App.vue
index 31e8fd40..3532f898 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -59,7 +59,7 @@
     <UserReportingModal />
     <PostStatusModal />
     <SettingsModal />
-    <div id="modal"/>
+    <div id="modal" />
     <GlobalNoticeList />
   </div>
 </template>
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"
-- 
cgit v1.2.3-70-g09d2


From 53cde520276af98a9b2b20cd0e8acf7bde768e70 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 27 Mar 2022 14:16:23 +0300
Subject: fix font control

---
 src/components/font_control/font_control.js  | 9 +++++----
 src/components/font_control/font_control.vue | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/components/font_control/font_control.js')

diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 24bad937..92ee3f30 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -6,11 +6,12 @@ export default {
     Select
   },
   props: [
-    'name', 'label', 'value', 'fallback', 'options', 'no-inherit'
+    'name', 'label', 'modelValue', 'fallback', 'options', 'no-inherit'
   ],
+  emits: ['update:modelValue'],
   data () {
     return {
-      lValue: this.value,
+      lValue: this.modelValue,
       availableOptions: [
         this.noInherit ? '' : 'inherit',
         'custom',
@@ -22,7 +23,7 @@ export default {
     }
   },
   beforeUpdate () {
-    this.lValue = this.value
+    this.lValue = this.modelValue
   },
   computed: {
     present () {
@@ -37,7 +38,7 @@ export default {
       },
       set (v) {
         set(this.lValue, 'family', v)
-        this.$emit('input', this.lValue)
+        this.$emit('update:modelValue', this.lValue)
       }
     },
     isCustom () {
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 2006c7f6..f100c3a9 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -14,8 +14,8 @@
       :id="name + '-o'"
       class="opt exlcude-disabled"
       type="checkbox"
-      :modelValue="present"
-      @input="$emit('update:modelValue', typeof value === 'undefined' ? fallback : undefined)"
+      :checked="present"
+      @change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
     >
     <label
       v-if="typeof fallback !== 'undefined'"
-- 
cgit v1.2.3-70-g09d2