From d9d4d8954e8dc7a10b5c36840437516f6e56b436 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 29 Mar 2022 11:57:54 +0300
Subject: [PATCH] Revert "lint"
This reverts commit f20ae34400b35c230d3e7824f98d9b3f4e977f82.
---
src/components/color_input/color_input.vue | 2 +-
src/components/notification/notification.vue | 5 +----
src/components/opacity_input/opacity_input.vue | 2 +-
src/components/poll/poll.vue | 5 +----
src/components/selectable_list/selectable_list.vue | 4 ++--
.../settings_modal/helpers/boolean_setting.vue | 2 +-
src/components/settings_modal/helpers/choice_setting.vue | 2 +-
src/components/settings_modal/settings_modal.vue | 7 ++-----
src/components/settings_modal/tabs/profile_tab.vue | 2 +-
.../settings_modal/tabs/theme_tab/theme_tab.vue | 9 +++------
src/components/shadow_control/shadow_control.vue | 3 +--
src/components/thread_tree/thread_tree.vue | 6 ++----
src/components/user_avatar/user_avatar.vue | 2 +-
.../user_reporting_modal/user_reporting_modal.vue | 2 +-
14 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue
index e84603c3..bb25f5a8 100644
--- a/src/components/color_input/color_input.vue
+++ b/src/components/color_input/color_input.vue
@@ -11,7 +11,7 @@
</label>
<Checkbox
v-if="typeof fallback !== 'undefined' && showOptionalTickbox"
- :model-value="present"
+ :modelValue="present"
:disabled="disabled"
class="opt"
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index ff7a21f1..d77b2f57 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -112,10 +112,7 @@
</span>
<span v-if="notification.type === 'pleroma:emoji_reaction'">
<small>
- <i18n-t
- scope="global"
- keypath="notifications.reacted_with"
- >
+ <i18n-t scope="global" keypath="notifications.reacted_with">
<span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
</i18n-t>
</small>
diff --git a/src/components/opacity_input/opacity_input.vue b/src/components/opacity_input/opacity_input.vue
index 15d08e04..83bc917d 100644
--- a/src/components/opacity_input/opacity_input.vue
+++ b/src/components/opacity_input/opacity_input.vue
@@ -11,7 +11,7 @@
</label>
<Checkbox
v-if="typeof fallback !== 'undefined'"
- :model-value="present"
+ :modelValue="present"
:disabled="disabled"
class="opt"
@update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 9e37a9d7..c3880096 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -71,10 +71,7 @@
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ยท
</template>
</div>
- <i18n-t
- scope="global"
- :keypath="expired ? 'polls.expired' : 'polls.expires_in'"
- >
+ <i18n-t scope="global" :keypath="expired ? 'polls.expired' : 'polls.expires_in'">
<Timeago
:time="expiresAt"
:auto-update="60"
diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue
index 6d4d0629..cf7cec27 100644
--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@@ -6,7 +6,7 @@
>
<div class="selectable-list-checkbox-wrapper">
<Checkbox
- :model-value="allSelected"
+ :modelValue="allSelected"
:indeterminate="someSelected"
@change="toggleAll"
>
@@ -31,7 +31,7 @@
>
<div class="selectable-list-checkbox-wrapper">
<Checkbox
- :model-value="isSelected(item)"
+ :modelValue="isSelected(item)"
@change="checked => toggle(checked, item)"
/>
</div>
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 69584808..3808bc74 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,7 +4,7 @@
class="BooleanSetting"
>
<Checkbox
- :model-value="state"
+ :modelValue="state"
:disabled="disabled"
@update:modelValue="update"
>
diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue
index 258c7422..b6aa853a 100644
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@@ -6,7 +6,7 @@
<slot />
{{ ' ' }}
<Select
- :model-value="state"
+ :modelValue="state"
:disabled="disabled"
@update:modelValue="update"
>
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index e0e8304d..18dd3d7a 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -110,15 +110,12 @@
</template>
</Popover>
- <Checkbox
- :model-value="!!expertLevel"
- @update:modelValue="expertLevel = Number($event)"
- >
+ <Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)">
{{ $t("settings.expert_mode") }}
</Checkbox>
<span
- id="unscrolled-content"
class="extra-content"
+ id="unscrolled-content"
/>
</div>
</div>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index d3f6727f..b78581bd 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -184,8 +184,8 @@
<button
v-if="!isDefaultBackground"
class="button-unstyled"
- :title="$t('settings.reset_profile_background')"
@click="resetBackground"
+ :title="$t('settings.reset_profile_background')"
>
<FAIcon
class="reset-button"
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index ff2fece9..dfa9a735 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -951,16 +951,14 @@
:fallback="currentShadowFallback"
/>
<div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'">
- <i18n-t
- scope="global"
+ <i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.always_drop_shadow"
tag="p"
>
<code>filter: drop-shadow()</code>
</i18n-t>
<p>{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}</p>
- <i18n-t
- scope="global"
+ <i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.drop_shadow_syntax"
tag="p"
>
@@ -968,8 +966,7 @@
<code>spread-radius</code>
<code>inset</code>
</i18n-t>
- <i18n-t
- scope="global"
+ <i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.inset_classic"
tag="p"
>
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index f2fc7b99..d1e5fc22 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -204,8 +204,7 @@
v-model="selected.alpha"
:disabled="!present"
/>
- <i18n-t
- scope="global"
+ <i18n-t scope="global"
keypath="settings.style.shadows.hintV3"
tag="p"
>
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index 74577583..f81653eb 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -74,9 +74,8 @@
v-if="currentReplies.length && !threadShowing"
class="thread-tree-replies thread-tree-replies-hidden"
>
- <i18n-t
+ <i18n-t scope="global"
v-if="simple"
- scope="global"
tag="button"
keypath="status.thread_follow_with_icon"
class="button-unstyled -link thread-tree-show-replies-button"
@@ -93,9 +92,8 @@
</span>
</template>
</i18n-t>
- <i18n-t
+ <i18n-t scope="global"
v-else
- scope="global"
tag="button"
keypath="status.thread_show_full_with_icon"
class="button-unstyled -link thread-tree-show-replies-button"
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index f4d294df..b19ce89b 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -2,7 +2,7 @@
<span
class="Avatar"
:class="{ '-compact': compact }"
- >
+ >
<StillImage
v-if="user"
class="avatar"
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index cd7b52c4..2993e4ec 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -53,7 +53,7 @@
:statusoid="item"
/>
<Checkbox
- :model-value="isChecked(item.id)"
+ :modelValue="isChecked(item.id)"
@change="checked => toggleStatus(checked, item.id)"
/>
</div>