diff --git a/app/javascript/vue/shared/content/attachments/attachment_actions.vue b/app/javascript/vue/shared/content/attachments/attachment_actions.vue
index a4b6d6f4c..71561f7c3 100644
--- a/app/javascript/vue/shared/content/attachments/attachment_actions.vue
+++ b/app/javascript/vue/shared/content/attachments/attachment_actions.vue
@@ -2,7 +2,6 @@
diff --git a/app/javascript/vue/shared/content/attachments/context_menu.vue b/app/javascript/vue/shared/content/attachments/context_menu.vue
index e6b8d51d0..bb17af66c 100644
--- a/app/javascript/vue/shared/content/attachments/context_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/context_menu.vue
@@ -1,7 +1,6 @@
@@ -84,7 +64,6 @@ import RenameAttachmentModal from '../modal/rename_modal.vue';
import deleteAttachmentModal from './delete_modal.vue';
import MoveAssetModal from '../modal/move.vue';
import MoveMixin from './mixins/move.js';
-import OpenLocallyMixin from './mixins/open_locally.js';
import MenuDropdown from '../../menu_dropdown.vue';
import axios from '../../../../packs/custom_axios.js';
@@ -96,7 +75,7 @@ export default {
MoveAssetModal,
MenuDropdown
},
- mixins: [MoveMixin, OpenLocallyMixin],
+ mixins: [MoveMixin],
props: {
attachment: {
type: Object,
@@ -186,16 +165,6 @@ export default {
},
reloadAttachments() {
this.$emit('attachment:uploaded');
- },
- openMarvinJsEditor() {
- MarvinJsEditor.initNewButton(
- this.$refs.marvinjsEditButton,
- this.reloadAttachments
- );
- $(this.$refs.marvinjsEditButton).trigger('click');
- },
- openScinoteEditor() {
- $(this.$refs.imageEditButton).trigger('click');
}
}
};
diff --git a/app/javascript/vue/shared/content/attachments/inline.vue b/app/javascript/vue/shared/content/attachments/inline.vue
index df5fae80d..14788fc32 100644
--- a/app/javascript/vue/shared/content/attachments/inline.vue
+++ b/app/javascript/vue/shared/content/attachments/inline.vue
@@ -34,7 +34,6 @@
diff --git a/app/javascript/vue/shared/content/attachments/list.vue b/app/javascript/vue/shared/content/attachments/list.vue
index d29b21d6f..d8cdc5ad6 100644
--- a/app/javascript/vue/shared/content/attachments/list.vue
+++ b/app/javascript/vue/shared/content/attachments/list.vue
@@ -33,7 +33,6 @@
diff --git a/app/javascript/vue/shared/content/attachments/open_menu.vue b/app/javascript/vue/shared/content/attachments/open_menu.vue
index 36157bf64..c648b546e 100644
--- a/app/javascript/vue/shared/content/attachments/open_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/open_menu.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
@@ -102,15 +119,43 @@ export default {
MenuDropdown
},
props: {
- multipleOpenOptions: {
- type: Array,
- required: true
- },
attachment: {
type: Object,
required: true
}
},
+ computed: {
+ multipleOpenOptions() {
+ const options = [];
+ if (this.attachment.attributes.wopi && this.attachment.attributes.urls.edit_asset) {
+ options.push({
+ text: this.attachment.attributes.wopi_context.button_text,
+ url: this.attachment.attributes.urls.edit_asset,
+ url_target: '_blank'
+ });
+ }
+ if (this.attachment.attributes.asset_type !== 'marvinjs'
+ && this.attachment.attributes.image_editable
+ && this.attachment.attributes.urls.start_edit_image) {
+ options.push({
+ text: this.i18n.t('assets.file_preview.edit_in_scinote'),
+ emit: 'open_scinote_editor'
+ });
+ }
+ if (this.canOpenLocally) {
+ const text = this.localAppName
+ ? this.i18n.t('attachments.open_locally_in', { application: this.localAppName })
+ : this.i18n.t('attachments.open_locally');
+
+ options.push({
+ text,
+ emit: 'open_locally',
+ data_e2e: 'e2e-BT-attachmentOptions-openLocally'
+ });
+ }
+ return options;
+ }
+ },
methods: {
toggleMenu(isOpen) {
this.$emit('menu-dropdown-toggle', isOpen);
diff --git a/app/javascript/vue/shared/content/attachments/thumbnail.vue b/app/javascript/vue/shared/content/attachments/thumbnail.vue
index e178189ec..ebdc25442 100644
--- a/app/javascript/vue/shared/content/attachments/thumbnail.vue
+++ b/app/javascript/vue/shared/content/attachments/thumbnail.vue
@@ -75,21 +75,6 @@
:targets_url="attachment.attributes.urls.move_targets"
@confirm="moveAttachment($event)" @cancel="closeMoveModal"
/>
-
-
-