diff --git a/components/PlaylistTable.vue b/components/PlaylistTable.vue index 2e16cea3..18423d73 100644 --- a/components/PlaylistTable.vue +++ b/components/PlaylistTable.vue @@ -226,13 +226,13 @@ function addBG(obj: any) { if (obj.item) { obj.item.classList.add('!bg-fuchsia-900/30') } else { - obj.classList.add('!bg-fuchsia-900/30') + obj?.classList?.add('!bg-fuchsia-900/30') } } function removeBG(item: any) { setTimeout(() => { - item.classList.remove('!bg-fuchsia-900/30') + item?.classList?.remove('!bg-fuchsia-900/30') }, 100) } @@ -241,7 +241,7 @@ function addClip(event: any) { const n = event.newIndex const uid = genUID() - event.item.remove() + event.item?.remove() const storagePath = configStore.playout.storage.path const sourcePath = `${storagePath}/${mediaStore.folderTree.source}/${mediaStore.folderTree.files[o].name}`.replace( @@ -280,6 +280,8 @@ function moveItemInArray(event: any) { function deletePlaylistItem(index: number) { playlistStore.playlist.splice(index, 1) + + processPlaylist(listDate.value, playlistStore.playlist, false) classSwitcher() } diff --git a/composables/helper.ts b/composables/helper.ts index 01ecb481..22971e2a 100644 --- a/composables/helper.ts +++ b/composables/helper.ts @@ -235,6 +235,8 @@ export const playlistOperations = () => { !configStore.playout.playlist.infinit ) { item.overtime = true + } else if (item.overtime) { + delete item.overtime } item.begin = begin diff --git a/package-lock.json b/package-lock.json index 4d1aa6d1..5601a371 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "ffplayout-frontend", - "version": "0.9.1", + "version": "0.9.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ffplayout-frontend", - "version": "0.9.1", + "version": "0.9.2", "hasInstallScript": true, "dependencies": { "@nuxtjs/color-mode": "^3.4.1", "@pinia/nuxt": "^0.5.1", - "@vuepic/vue-datepicker": "^8.5.1", + "@vuepic/vue-datepicker": "^8.6.0", "@vueuse/nuxt": "^10.9.0", "bootstrap-icons": "^1.11.3", "dayjs": "^1.11.11", @@ -33,7 +33,7 @@ "daisyui": "^4.11.1", "postcss": "^8.4.38", "postcss-loader": "^8.1.1", - "sass": "^1.77.0", + "sass": "^1.77.1", "sass-loader": "^14.2.1", "vue": "^3.4.27", "vue-router": "^4.3.2" @@ -4414,9 +4414,9 @@ "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==" }, "node_modules/@vuepic/vue-datepicker": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-8.5.1.tgz", - "integrity": "sha512-kFfYB14wKShBhEcHwaQgonMo4AhsldiLuoxrWuutYBdHsUnwecY8vw+zoieI/mZsCYep4chH1yDByYf5JGjKOA==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-8.6.0.tgz", + "integrity": "sha512-ZnG7xquVf7WyMKXk7JxWOJ5ursig1t8o2AtH9ycetiik+lemV9+HNEx+YOR1xeCUfhupGTgJmyAxCSZHP/Sv/w==", "dependencies": { "date-fns": "^3.6.0" }, @@ -12004,9 +12004,9 @@ "optional": true }, "node_modules/sass": { - "version": "1.77.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.0.tgz", - "integrity": "sha512-eGj4HNfXqBWtSnvItNkn7B6icqH14i3CiCGbzMKs3BAPTq62pp9NBYsBgyN4cA+qssqo9r26lW4JSvlaUUWbgw==", + "version": "1.77.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.1.tgz", + "integrity": "sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w==", "devOptional": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index 8674e6b5..6f230db6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffplayout-frontend", - "version": "0.9.1", + "version": "0.9.2", "description": "Web GUI for ffplayout", "author": "Jonathan Baecker", "private": true, @@ -15,7 +15,7 @@ "dependencies": { "@nuxtjs/color-mode": "^3.4.1", "@pinia/nuxt": "^0.5.1", - "@vuepic/vue-datepicker": "^8.5.1", + "@vuepic/vue-datepicker": "^8.6.0", "@vueuse/nuxt": "^10.9.0", "bootstrap-icons": "^1.11.3", "dayjs": "^1.11.11", @@ -37,7 +37,7 @@ "daisyui": "^4.11.1", "postcss": "^8.4.38", "postcss-loader": "^8.1.1", - "sass": "^1.77.0", + "sass": "^1.77.1", "sass-loader": "^14.2.1", "vue": "^3.4.27", "vue-router": "^4.3.2" diff --git a/pages/player.vue b/pages/player.vue index f041610e..f2064551 100644 --- a/pages/player.vue +++ b/pages/player.vue @@ -357,8 +357,6 @@ function editPlaylistItem(i: number) { editId.value = i showSourceModal.value = true - console.log('ad', playlistStore.playlist[i].category) - newSource.value = { begin: playlistStore.playlist[i].begin, title: playlistStore.playlist[i].title,