logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: d9d4d8954e8dc7a10b5c36840437516f6e56b436
parent b132581b3a5291fdc9ca62baf912a40be747ee6b
Author: Henry Jameson <me@hjkos.com>
Date:   Tue, 29 Mar 2022 11:57:54 +0300

Revert "lint"

This reverts commit f20ae34400b35c230d3e7824f98d9b3f4e977f82.

Diffstat:

Msrc/components/color_input/color_input.vue2+-
Msrc/components/notification/notification.vue5+----
Msrc/components/opacity_input/opacity_input.vue2+-
Msrc/components/poll/poll.vue5+----
Msrc/components/selectable_list/selectable_list.vue4++--
Msrc/components/settings_modal/helpers/boolean_setting.vue2+-
Msrc/components/settings_modal/helpers/choice_setting.vue2+-
Msrc/components/settings_modal/settings_modal.vue7++-----
Msrc/components/settings_modal/tabs/profile_tab.vue2+-
Msrc/components/settings_modal/tabs/theme_tab/theme_tab.vue9+++------
Msrc/components/shadow_control/shadow_control.vue3+--
Msrc/components/thread_tree/thread_tree.vue6++----
Msrc/components/user_avatar/user_avatar.vue2+-
Msrc/components/user_reporting_modal/user_reporting_modal.vue2+-
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 @@ -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 @@ -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 @@ -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 @@ -71,10 +71,7 @@ {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;ยท&nbsp; </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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -53,7 +53,7 @@ :statusoid="item" /> <Checkbox - :model-value="isChecked(item.id)" + :modelValue="isChecked(item.id)" @change="checked => toggleStatus(checked, item.id)" /> </div>