From 92bedeac15ca8f29dafd9b15e505ce2b143b3177 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sat, 30 Jul 2022 12:25:15 -0500 Subject: [PATCH] Update:Click chapter times in chapters table to jump to timestamp --- client/components/app/StreamContainer.vue | 6 +++- .../modals/EditSeriesInputInnerModal.vue | 2 -- client/components/modals/Modal.vue | 15 +++++++-- client/components/prompt/Confirm.vue | 18 ++++++++--- client/components/prompt/Dialog.vue | 2 -- client/components/tables/ChaptersTable.vue | 31 +++++++++++++++++-- .../tables/podcast/EpisodeTableRow.vue | 2 +- client/store/index.js | 3 +- client/tailwind.config.js | 3 +- 9 files changed, 65 insertions(+), 17 deletions(-) diff --git a/client/components/app/StreamContainer.vue b/client/components/app/StreamContainer.vue index e951dbfd..e27d7695 100644 --- a/client/components/app/StreamContainer.vue +++ b/client/components/app/StreamContainer.vue @@ -364,7 +364,11 @@ export default { var episodeId = payload.episodeId || null if (this.playerHandler.libraryItemId == libraryItemId && this.playerHandler.episodeId == episodeId) { - this.playerHandler.play() + if (payload.startTime !== null && !isNaN(payload.startTime)) { + this.seek(payload.startTime) + } else { + this.playerHandler.play() + } return } diff --git a/client/components/modals/EditSeriesInputInnerModal.vue b/client/components/modals/EditSeriesInputInnerModal.vue index e43ab4eb..fb540105 100644 --- a/client/components/modals/EditSeriesInputInnerModal.vue +++ b/client/components/modals/EditSeriesInputInnerModal.vue @@ -89,7 +89,6 @@ export default { setTimeout(() => { this.content.style.transform = 'scale(1)' }, 10) - document.documentElement.classList.add('modal-open') this.$store.commit('setInnerModalOpen', true) this.$eventBus.$on('modal-hotkey', this.hotkey) @@ -97,7 +96,6 @@ export default { setHide() { if (this.content) this.content.style.transform = 'scale(0)' if (this.el) this.el.remove() - document.documentElement.classList.remove('modal-open') this.$store.commit('setInnerModalOpen', false) this.$eventBus.$off('modal-hotkey', this.hotkey) diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue index 40593ed9..87185127 100644 --- a/client/components/modals/Modal.vue +++ b/client/components/modals/Modal.vue @@ -50,7 +50,8 @@ export default { return { el: null, content: null, - preventClickoutside: false + preventClickoutside: false, + isShowingPrompt: false } }, watch: { @@ -93,7 +94,7 @@ export default { this.show = false }, clickBg(ev) { - if (!this.show) return + if (!this.show || this.isShowingPrompt) return if (this.preventClickoutside) { this.preventClickoutside = false return @@ -147,8 +148,16 @@ export default { } else { console.warn('Invalid modal init', this.name) } + }, + showingPrompt(isShowing) { + this.isShowingPrompt = isShowing } }, - mounted() {} + mounted() { + this.$eventBus.$on('showing-prompt', this.showingPrompt) + }, + beforeDestroy() { + this.$eventBus.$off('showing-prompt', this.showingPrompt) + } } \ No newline at end of file diff --git a/client/components/prompt/Confirm.vue b/client/components/prompt/Confirm.vue index e0e4e69b..b5ef8296 100644 --- a/client/components/prompt/Confirm.vue +++ b/client/components/prompt/Confirm.vue @@ -1,5 +1,5 @@