Merge branch 'vue3-again' into shigusegubu-vue3

* vue3-again:
  manual lint
  Revert "fix weird thing i somehow missed"
  Revert "lint"
This commit is contained in:
Henry Jameson 2022-03-29 12:04:24 +03:00
commit 6a69c546cc
12 changed files with 14 additions and 23 deletions

View file

@ -11,7 +11,7 @@
</label> </label>
<Checkbox <Checkbox
v-if="typeof fallback !== 'undefined' && showOptionalTickbox" v-if="typeof fallback !== 'undefined' && showOptionalTickbox"
:model-value="present" :modelValue="present"
:disabled="disabled" :disabled="disabled"
class="opt" class="opt"
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)" @update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"

View file

@ -112,10 +112,7 @@
</span> </span>
<span v-if="notification.type === 'pleroma:emoji_reaction'"> <span v-if="notification.type === 'pleroma:emoji_reaction'">
<small> <small>
<i18n-t <i18n-t scope="global" keypath="notifications.reacted_with">
scope="global"
keypath="notifications.reacted_with"
>
<span class="emoji-reaction-emoji">{{ notification.emoji }}</span> <span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
</i18n-t> </i18n-t>
</small> </small>

View file

@ -11,7 +11,7 @@
</label> </label>
<Checkbox <Checkbox
v-if="typeof fallback !== 'undefined'" v-if="typeof fallback !== 'undefined'"
:model-value="present" :modelValue="present"
:disabled="disabled" :disabled="disabled"
class="opt" class="opt"
@update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)" @update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"

View file

@ -71,10 +71,7 @@
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp; {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
</template> </template>
</div> </div>
<i18n-t <i18n-t scope="global" :keypath="expired ? 'polls.expired' : 'polls.expires_in'">
scope="global"
:keypath="expired ? 'polls.expired' : 'polls.expires_in'"
>
<Timeago <Timeago
:time="expiresAt" :time="expiresAt"
:auto-update="60" :auto-update="60"

View file

@ -6,7 +6,7 @@
> >
<div class="selectable-list-checkbox-wrapper"> <div class="selectable-list-checkbox-wrapper">
<Checkbox <Checkbox
:model-value="allSelected" :modelValue="allSelected"
:indeterminate="someSelected" :indeterminate="someSelected"
@change="toggleAll" @change="toggleAll"
> >
@ -31,7 +31,7 @@
> >
<div class="selectable-list-checkbox-wrapper"> <div class="selectable-list-checkbox-wrapper">
<Checkbox <Checkbox
:model-value="isSelected(item)" :modelValue="isSelected(item)"
@change="checked => toggle(checked, item)" @change="checked => toggle(checked, item)"
/> />
</div> </div>

View file

@ -4,7 +4,7 @@
class="BooleanSetting" class="BooleanSetting"
> >
<Checkbox <Checkbox
:model-value="state" :modelValue="state"
:disabled="disabled" :disabled="disabled"
@update:modelValue="update" @update:modelValue="update"
> >

View file

@ -6,7 +6,7 @@
<slot /> <slot />
{{ ' ' }} {{ ' ' }}
<Select <Select
:model-value="state" :modelValue="state"
:disabled="disabled" :disabled="disabled"
@update:modelValue="update" @update:modelValue="update"
> >

View file

@ -110,15 +110,12 @@
</template> </template>
</Popover> </Popover>
<Checkbox <Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)">
:model-value="!!expertLevel"
@update:modelValue="expertLevel = Number($event)"
>
{{ $t("settings.expert_mode") }} {{ $t("settings.expert_mode") }}
</Checkbox> </Checkbox>
<span <span
id="unscrolled-content"
class="extra-content" class="extra-content"
id="unscrolled-content"
/> />
</div> </div>
</div> </div>

View file

@ -184,8 +184,8 @@
<button <button
v-if="!isDefaultBackground" v-if="!isDefaultBackground"
class="button-unstyled" class="button-unstyled"
:title="$t('settings.reset_profile_background')"
@click="resetBackground" @click="resetBackground"
:title="$t('settings.reset_profile_background')"
> >
<FAIcon <FAIcon
class="reset-button" class="reset-button"

View file

@ -75,8 +75,8 @@
class="thread-tree-replies thread-tree-replies-hidden" class="thread-tree-replies thread-tree-replies-hidden"
> >
<i18n-t <i18n-t
v-if="simple"
scope="global" scope="global"
v-if="simple"
tag="button" tag="button"
keypath="status.thread_follow_with_icon" keypath="status.thread_follow_with_icon"
class="button-unstyled -link thread-tree-show-replies-button" class="button-unstyled -link thread-tree-show-replies-button"

View file

@ -53,7 +53,7 @@
:statusoid="item" :statusoid="item"
/> />
<Checkbox <Checkbox
:model-value="isChecked(item.id)" :modelValue="isChecked(item.id)"
@change="checked => toggleStatus(checked, item.id)" @change="checked => toggleStatus(checked, item.id)"
/> />
</div> </div>