diff --git a/app/javascript/packs/vue/share_task_container.js b/app/javascript/packs/vue/share_task_container.js index a99cb2774..a5ac674c5 100644 --- a/app/javascript/packs/vue/share_task_container.js +++ b/app/javascript/packs/vue/share_task_container.js @@ -2,13 +2,10 @@ import PerfectScrollbar from 'vue3-perfect-scrollbar'; import { createApp } from 'vue/dist/vue.esm-bundler.js'; import 'vue3-perfect-scrollbar/dist/vue3-perfect-scrollbar.css'; import ShareLinkContainer from '../../vue/shareable_links/container.vue'; +import { mountWithTurbolinks } from './helpers/turbolinks.js'; -function initShareTaskContainer() { - const app = createApp({}); - app.component('ShareLinkContainer', ShareLinkContainer); - app.use(PerfectScrollbar); - app.config.globalProperties.i18n = window.I18n; - app.mount('.share-task-container'); -} - -initShareTaskContainer(); +const app = createApp({}); +app.component('ShareTaskContainer', ShareLinkContainer); +app.use(PerfectScrollbar); +app.config.globalProperties.i18n = window.I18n; +mountWithTurbolinks(app, '#share-task-container'); diff --git a/app/javascript/vue/shared/content/mixins/attachments.js b/app/javascript/vue/shared/content/mixins/attachments.js index 684351b2f..728fc43b9 100644 --- a/app/javascript/vue/shared/content/mixins/attachments.js +++ b/app/javascript/vue/shared/content/mixins/attachments.js @@ -136,8 +136,8 @@ export default { changeAttachmentsViewMode(viewMode) { this.attachmentsParent.attributes.assets_view_mode = viewMode; this.attachments.forEach((attachment) => { - this.$set(attachment.attributes, 'view_mode', viewMode); - this.$set(attachment.attributes, 'asset_order', this.viewModeOrder[viewMode]); + attachment.attributes['view_mode'] = viewMode; + attachment.attributes['asset_order'] = this.viewModeOrder[viewMode]; }); $.post(this.attachmentsParent.attributes.urls.update_asset_view_mode_url, { assets_view_mode: viewMode @@ -145,8 +145,8 @@ export default { }, updateAttachmentViewMode(id, viewMode) { const attachment = this.attachments.find(e => e.id === id); - this.$set(attachment.attributes, 'view_mode', viewMode); - this.$set(attachment.attributes, 'asset_order', this.viewModeOrder[viewMode]); + attachment.attributes['view_mode'] = viewMode; + attachment.attributes['asset_order'] = this.viewModeOrder[viewMode]; } } }; diff --git a/app/javascript/vue/shared/menu_dropdown.vue b/app/javascript/vue/shared/menu_dropdown.vue index abf36a63f..8ab614260 100644 --- a/app/javascript/vue/shared/menu_dropdown.vue +++ b/app/javascript/vue/shared/menu_dropdown.vue @@ -1,5 +1,5 @@