Fix some vue compat warnings

This commit is contained in:
Kasper Seweryn 2022-04-19 20:52:04 +02:00 committed by Georg Krause
parent b3022c26b6
commit 8402621faf
8 changed files with 31 additions and 48 deletions

View File

@ -522,7 +522,7 @@ export default {
languageSelection: this.$language.current languageSelection: this.$language.current
} }
}, },
destroy () { unmount () {
if (this.fetchInterval) { if (this.fetchInterval) {
clearInterval(this.fetchInterval) clearInterval(this.fetchInterval)
} }

View File

@ -1,3 +1,23 @@
<script setup lang="ts">
import { refAutoReset, toRefs } from '@vueuse/core'
import { watch } from 'vue'
interface Props {
isLoading: boolean
size?: string
}
const { isLoading, size } = toRefs(withDefaults(
defineProps<Props>(),
{ size: 'small' }
))
const isDone = refAutoReset(false, 2000)
watch(isLoading, loading => {
isDone.value = !loading
})
</script>
<template> <template>
<span <span
v-if="isLoading || isDone" v-if="isLoading || isDone"
@ -13,40 +33,3 @@
/> />
</span> </span>
</template> </template>
<script>
export default {
props: {
isLoading: { type: Boolean, required: true },
size: { type: String, default: 'small' }
},
data () {
return {
timer: null,
isDone: false
}
},
watch: {
isLoading (v) {
const self = this
if (v && this.timer) {
clearTimeout(this.timer)
}
if (v) {
this.isDone = false
} else {
this.isDone = true
this.timer = setTimeout(() => {
self.isDone = false
}, (2000))
}
}
},
destroyed () {
if (this.timer) {
clearTimeout(this.timer)
}
}
}
</script>

View File

@ -500,7 +500,7 @@ export default {
}) })
window.onbeforeunload = e => this.onBeforeUnload(e) window.onbeforeunload = e => this.onBeforeUnload(e)
}, },
destroyed () { unmounted () {
this.$store.commit('ui/removeWebsocketEventHandler', { this.$store.commit('ui/removeWebsocketEventHandler', {
eventName: 'import.status_updated', eventName: 'import.status_updated',
id: 'fileUpload' id: 'fileUpload'

View File

@ -54,7 +54,7 @@ export default {
mounted () { mounted () {
this.focusTrap = createFocusTrap(this.$el) this.focusTrap = createFocusTrap(this.$el)
}, },
beforeDestroy () { beforeUnmount () {
if (this.control) { if (this.control) {
$(this.$el).modal('hide') $(this.$el).modal('hide')
} }

View File

@ -1,6 +1,6 @@
import router from '~/router' import router from '~/router'
import store from '~/store' import store from '~/store'
import { createApp } from 'vue' import { createApp, defineAsyncComponent } from 'vue'
import useLogger from '~/composables/useLogger' import useLogger from '~/composables/useLogger'
import useTheme from '~/composables/useTheme' import useTheme from '~/composables/useTheme'
useTheme() useTheme()
@ -11,7 +11,7 @@ logger.debug('Environment variables:', import.meta.env)
const app = createApp({ const app = createApp({
components: { components: {
App: () => import('~/App.vue') App: defineAsyncComponent(() => import('~/App.vue'))
}, },
data: () => ({ isMounted: false }), data: () => ({ isMounted: false }),
async mounted () { async mounted () {

View File

@ -150,17 +150,17 @@ export default {
dispatch('radios/populateQueue', null, { root: true }) dispatch('radios/populateQueue', null, { root: true })
} }
}, },
clean ({ dispatch, commit }) { clean ({ dispatch, commit, state }) {
dispatch('radios/stop', null, { root: true }) dispatch('radios/stop', null, { root: true })
dispatch('player/stop', null, { root: true }) dispatch('player/stop', null, { root: true })
commit('tracks', []) state.tracks.length = 0
dispatch('currentIndex', -1) dispatch('currentIndex', -1)
// so we replay automatically on next track append // so we replay automatically on next track append
commit('ended', true) commit('ended', true)
}, },
async shuffle ({ dispatch, commit, state }, callback) { async shuffle ({ dispatch, state }, callback) {
const shuffled = shuffle(state.tracks) const shuffled = shuffle(state.tracks)
commit('tracks', []) state.tracks.length = 0
const params = { tracks: shuffled } const params = { tracks: shuffled }
if (callback) { if (callback) {
params.callback = callback params.callback = callback

View File

@ -263,7 +263,7 @@ export default {
handler: this.handleNewNotification handler: this.handleNewNotification
}) })
}, },
destroyed () { unmounted () {
this.$store.commit('ui/removeWebsocketEventHandler', { this.$store.commit('ui/removeWebsocketEventHandler', {
eventName: 'inbox.item_added', eventName: 'inbox.item_added',
id: 'notificationPage' id: 'notificationPage'

View File

@ -232,7 +232,7 @@ export default {
}) })
} }
}, },
destroyed () { unmounted () {
this.$store.commit('ui/removeWebsocketEventHandler', { this.$store.commit('ui/removeWebsocketEventHandler', {
eventName: 'import.status_updated', eventName: 'import.status_updated',
id: 'fileUploadChannel' id: 'fileUploadChannel'