Merge branch 'vue3-again' into shigusegubu-vue3

* vue3-again:
  fix misc warnings
  properly implement resettableAsyncComponent
  fix opacity control again
  rename some binding hooks according to new names
  fix warnings
  fix some more warnings
  remove some warnings
This commit is contained in:
Henry Jameson 2022-03-29 00:02:23 +03:00
commit 4b3f525a8e
15 changed files with 32 additions and 33 deletions

View file

@ -19,6 +19,7 @@
<script>
export default {
emits: ['resetAsyncComponent'],
methods: {
retry () {
this.$emit('resetAsyncComponent')

View file

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

View file

@ -20,7 +20,7 @@
:id="name"
class="input-number"
type="number"
:value="value || fallback"
:value="modelValue || fallback"
:disabled="!present || disabled"
max="1"
min="0"

View file

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

View file

@ -8,7 +8,7 @@ export default {
path: String,
disabled: Boolean,
min: Number,
expert: Number
expert: [Number, String]
},
computed: {
pathDefault () {

View file

@ -56,8 +56,8 @@ const SettingsModal = {
SettingsModalContent: getResettableAsyncComponent(
() => import('./settings_modal_content.vue'),
{
loading: PanelLoading,
error: AsyncComponentError,
loadingComponent: PanelLoading,
errorComponent: AsyncComponentError,
delay: 0
}
)

View file

@ -951,14 +951,14 @@
:fallback="currentShadowFallback"
/>
<div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'">
<i18n-t
<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
<i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.drop_shadow_syntax"
tag="p"
>
@ -966,7 +966,7 @@
<code>spread-radius</code>
<code>inset</code>
</i18n-t>
<i18n-t
<i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.inset_classic"
tag="p"
>

View file

@ -204,7 +204,7 @@
v-model="selected.alpha"
:disabled="!present"
/>
<i18n-t
<i18n-t scope="global"
keypath="settings.style.shadows.hintV3"
tag="p"
>

View file

@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
const controlledName = `controlled${camelized}`
const uncontrolledName = `uncontrolled${camelized}`
res[name] = function () {
return this[toggle] ? this[controlledName] : this[uncontrolledName]
return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
}
return res
}, {})
@ -311,7 +311,7 @@ const Status = {
return this.mergedConfig.hideWordFilteredPosts
},
hideStatus () {
return (this.virtualHidden || !this.shouldNotMute) && (
return (!this.shouldNotMute) && (
(this.muted && this.hideFilteredStatuses) ||
(this.userIsMuted && this.hideMutedUsers) ||
(this.status.thread_muted && this.hideMutedThreads) ||

View file

@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
const controlledName = `controlled${camelized}`
const uncontrolledName = `uncontrolled${camelized}`
res[name] = function () {
return this[toggle] ? this[controlledName] : this[uncontrolledName]
return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
}
return res
}, {})

View file

@ -74,7 +74,7 @@
v-if="currentReplies.length && !threadShowing"
class="thread-tree-replies thread-tree-replies-hidden"
>
<i18n-t
<i18n-t scope="global"
v-if="simple"
tag="button"
keypath="status.thread_follow_with_icon"
@ -92,7 +92,7 @@
</span>
</template>
</i18n-t>
<i18n-t
<i18n-t scope="global"
v-else
tag="button"
keypath="status.thread_show_full_with_icon"

View file

@ -43,8 +43,8 @@ const Timeline = {
filteredVisibleStatuses () {
return this.timeline.visibleStatuses.filter(status => this.timelineName !== 'user' || (status.id >= this.timeline.minId && status.id <= this.timeline.maxId))
},
filteredPinnedStatusesId () {
return this.pinnedStatusIds.filter(statusId => this.timeline.statusesObject[statusId])
filteredPinnedStatusIds () {
return (this.pinnedStatusIds || []).filter(statusId => this.timeline.statusesObject[statusId])
},
newStatusCount () {
return this.timeline.newStatusCount