diff --git a/client/src/vue_components/show/config/cues/CueEditor.vue b/client/src/vue_components/show/config/cues/CueEditor.vue index a72309a3..043642a1 100644 --- a/client/src/vue_components/show/config/cues/CueEditor.vue +++ b/client/src/vue_components/show/config/cues/CueEditor.vue @@ -31,25 +31,7 @@ Next Page - - - - Begin Editing - - - Stop Editing - - - + @@ -72,7 +54,7 @@ :previous-line="GET_SCRIPT_PAGE(currentEditPage)[index - 1]" :cue-types="CUE_TYPES" :cues="getCuesForLine(line)" - :can-edit="canEdit" + :line-part-cuts="SCRIPT_CUTS" /> @@ -145,6 +127,7 @@ export default { await this.GET_CHARACTER_GROUP_LIST(); await this.GET_CUE_TYPES(); await this.LOAD_CUES(); + await this.GET_CUTS(); // Get the max page of the saved version of the script await this.getMaxScriptPage(); @@ -199,7 +182,8 @@ export default { ...mapMutations(['REMOVE_PAGE', 'ADD_BLANK_LINE', 'SET_LINE']), ...mapActions(['GET_SCENE_LIST', 'GET_ACT_LIST', 'GET_CHARACTER_LIST', 'GET_CHARACTER_GROUP_LIST', 'LOAD_SCRIPT_PAGE', 'ADD_BLANK_PAGE', 'GET_SCRIPT_CONFIG_STATUS', - 'RESET_TO_SAVED', 'SAVE_NEW_PAGE', 'SAVE_CHANGED_PAGE', 'GET_CUE_TYPES', 'LOAD_CUES']), + 'RESET_TO_SAVED', 'SAVE_NEW_PAGE', 'SAVE_CHANGED_PAGE', 'GET_CUE_TYPES', 'LOAD_CUES', + 'GET_CUTS']), }, computed: { currentEditPageKey() { @@ -211,12 +195,9 @@ export default { } return 'primary'; }, - canEdit() { - return this.INTERNAL_UUID === this.CURRENT_EDITOR; - }, ...mapGetters(['CURRENT_SHOW', 'ACT_LIST', 'SCENE_LIST', 'CHARACTER_LIST', 'CHARACTER_GROUP_LIST', 'CAN_REQUEST_EDIT', 'CURRENT_EDITOR', 'INTERNAL_UUID', - 'GET_SCRIPT_PAGE', 'DEBUG_MODE_ENABLED', 'CUE_TYPES', 'SCRIPT_CUES']), + 'GET_SCRIPT_PAGE', 'DEBUG_MODE_ENABLED', 'CUE_TYPES', 'SCRIPT_CUES', 'SCRIPT_CUTS']), }, }; diff --git a/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue b/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue index 4f3c3cb7..0110ea41 100644 --- a/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue +++ b/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue @@ -24,13 +24,11 @@ class="cue-button" :style="{backgroundColor: cueBackgroundColour(cue), color: contrastColor({'bgColor': cueBackgroundColour(cue)})}" - :disabled="!canEdit" @click.stop="openEditForm(cue)" > {{ cueLabel(cue) }} @@ -60,7 +58,10 @@ {{ characterGroups.find((char) => (char.id === part.character_group_id)).name }} -

+

{{ part.line_text }}

@@ -223,9 +224,9 @@ export default { cueTypes: { required: true, }, - canEdit: { - type: Boolean, + linePartCuts: { required: true, + type: Array, }, }, data() { @@ -415,4 +416,7 @@ export default { margin-top: 1rem; margin-bottom: 1rem; } + .cut-line-part { + text-decoration: line-through; + }