From a0d9a0bf8c0a80699e35a255a05da44a2c725e8e Mon Sep 17 00:00:00 2001 From: Frank Rousseau Date: Thu, 19 Sep 2024 18:10:31 +0200 Subject: [PATCH 1/6] [assets] Fix display assets header --- src/components/pages/Assets.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue index aa175d6ec..7a095d87f 100644 --- a/src/components/pages/Assets.vue +++ b/src/components/pages/Assets.vue @@ -22,11 +22,7 @@ class="flexrow-item" icon="assets" :is-on="showSharedAssets" - :title=" - showSharedAssets - ? $t('breakdown.hide_library') - : $t('breakdown.show_library') - " + :title="$t('breakdown.show_library')" @click="showSharedAssets = !showSharedAssets" />
From 3e86be65a0f4a01e6a6f552411e2849fd634143a Mon Sep 17 00:00:00 2001 From: Frank Rousseau Date: Tue, 24 Sep 2024 11:34:43 +0200 Subject: [PATCH 2/6] [previews] Fix edge case when going to next frame --- src/components/mixins/player.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/mixins/player.js b/src/components/mixins/player.js index 5171bc969..3bd050f7a 100644 --- a/src/components/mixins/player.js +++ b/src/components/mixins/player.js @@ -592,6 +592,7 @@ export const playerMixin = { nextFrameTime = nextFrame / this.fps this.setFullPlayerTime(nextFrameTime) } else { + if (!this.rawPlayer) return const nextFrameTime = this.rawPlayer.getCurrentTimeRaw() + this.frameDuration + 0.0001 const nextFrame = Math.round(nextFrameTime * this.fps) From c0cc4b529363d8b74bd7fd300241ea271021dad6 Mon Sep 17 00:00:00 2001 From: Frank Rousseau Date: Tue, 24 Sep 2024 11:35:39 +0200 Subject: [PATCH 3/6] [comments] Fix attachment drop on add comment --- src/components/modals/AddAttachmentModal.vue | 36 +++++++++++++++++--- src/components/widgets/AddComment.vue | 14 +++++--- src/components/widgets/FileUpload.vue | 4 ++- 3 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/components/modals/AddAttachmentModal.vue b/src/components/modals/AddAttachmentModal.vue index 7eca34c75..db242cd14 100644 --- a/src/components/modals/AddAttachmentModal.vue +++ b/src/components/modals/AddAttachmentModal.vue @@ -7,9 +7,13 @@ >
-
-
- +

{{ title }}

{{ $t('tasks.comment_image') }}

-
+
= 0 + ) return + if (event.target.parentElement?.className?.indexOf( + 'add-attachment-buttons') >= 0 + ) return + if (event.target.parentElement?.className?.indexOf( + 'attachment-modal-box') >= 0 + ) return + const forms = [] for (let i = 0; i < event.dataTransfer.files.length; i++) { const form = new FormData() diff --git a/src/components/widgets/FileUpload.vue b/src/components/widgets/FileUpload.vue index c0a4a0626..da4094749 100644 --- a/src/components/widgets/FileUpload.vue +++ b/src/components/widgets/FileUpload.vue @@ -129,7 +129,9 @@ export default { this.isSaving = false this.isInitial = true this.uploadedFiles = [] - this.$refs.uploadInput.value = '' + if (this.$refs.uploadInput) { + this.$refs.uploadInput.value = '' + } }, onDragover() { From a52aa373d3433ce1ddf917cc6c9a5e41b744617d Mon Sep 17 00:00:00 2001 From: Frank Rousseau Date: Tue, 24 Sep 2024 14:06:09 +0200 Subject: [PATCH 4/6] [qa] Remove duplicated code --- src/components/modals/AddAttachmentModal.vue | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/components/modals/AddAttachmentModal.vue b/src/components/modals/AddAttachmentModal.vue index db242cd14..0506bb637 100644 --- a/src/components/modals/AddAttachmentModal.vue +++ b/src/components/modals/AddAttachmentModal.vue @@ -223,26 +223,6 @@ export default { this.forms = this.forms.filter(f => f !== form) }, - onDrop(event) { - this.isDraggingFile = false - this.fileField.onDrop(event) - event.preventDefault() - }, - - onFileDragover(event) { - event.preventDefault() - event.stopPropagation() - this.isDraggingFile = true - }, - - onFileDragLeave(event) { - event.preventDefault() - event.stopPropagation() - if (event.target.id === 'drop-mask') { - this.isDraggingFile = false - } - }, - onFileDragover(event) { event.preventDefault() event.stopPropagation() From 062b9de05a263fded8cd29ab7ddcb8aa2cb47c33 Mon Sep 17 00:00:00 2001 From: Frank Rousseau Date: Tue, 24 Sep 2024 14:06:36 +0200 Subject: [PATCH 5/6] [comments] Fix file drop on add comment widget --- src/components/widgets/AddComment.vue | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/components/widgets/AddComment.vue b/src/components/widgets/AddComment.vue index 39afc9dbe..8b408987f 100644 --- a/src/components/widgets/AddComment.vue +++ b/src/components/widgets/AddComment.vue @@ -618,15 +618,23 @@ export default { onDrop(event) { if (event.target.id === 'drop-mask') return - if (event.target.parentElement?.className?.indexOf( - 'add-attachment-box') >= 0 - ) return - if (event.target.parentElement?.className?.indexOf( - 'add-attachment-buttons') >= 0 - ) return - if (event.target.parentElement?.className?.indexOf( - 'attachment-modal-box') >= 0 - ) return + if ( + event.target.parentElement?.className?.indexOf('add-attachment-box') >= + 0 + ) + return + if ( + event.target.parentElement?.className?.indexOf( + 'add-attachment-buttons' + ) >= 0 + ) + return + if ( + event.target.parentElement?.className?.indexOf( + 'attachment-modal-box' + ) >= 0 + ) + return const forms = [] for (let i = 0; i < event.dataTransfer.files.length; i++) { From 6abf1262fdf45d8df9b1d821b9cf9842b77664b0 Mon Sep 17 00:00:00 2001 From: Frank Rousseau Date: Tue, 24 Sep 2024 14:19:24 +0200 Subject: [PATCH 6/6] [shots] Fix loading glitch --- src/store/modules/shots.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/shots.js b/src/store/modules/shots.js index a66edca1f..a7c39ed68 100644 --- a/src/store/modules/shots.js +++ b/src/store/modules/shots.js @@ -387,7 +387,6 @@ const actions = { const userFilters = rootGetters.userFilters const userFilterGroups = rootGetters.userFilterGroups const taskTypeMap = rootGetters.taskTypeMap - const taskMap = rootGetters.taskMap const episodeMap = rootGetters.episodeMap const personMap = rootGetters.personMap const isTVShow = rootGetters.isTVShow @@ -425,6 +424,7 @@ const actions = { }) .then(shots => { const sequenceMap = rootGetters.sequenceMap + const taskMap = rootGetters.taskMap commit(LOAD_SHOTS_END, { production, shots,