diff --git a/resources/assets/src/components/mixins/emitMounted.ts b/resources/assets/src/components/mixins/emitMounted.ts new file mode 100644 index 00000000..790cbfb1 --- /dev/null +++ b/resources/assets/src/components/mixins/emitMounted.ts @@ -0,0 +1,8 @@ +import Vue from 'vue' +import * as emitter from '../../scripts/event' + +export default Vue.extend({ + mounted() { + emitter.emit('mounted', { el: this.$root.$options.el }) + }, +}) diff --git a/resources/assets/src/index.ts b/resources/assets/src/index.ts index 94fb89b3..5533bf20 100644 --- a/resources/assets/src/index.ts +++ b/resources/assets/src/index.ts @@ -1,7 +1,6 @@ import Vue from 'vue' import loadI18n from './scripts/i18n-text' import './scripts' -import * as emitter from './scripts/event' import routes from './scripts/route' Vue.config.productionTip = false @@ -22,9 +21,6 @@ function loadModules() { // eslint-disable-next-line no-new new Vue({ el: route.el, - mounted() { - this.$nextTick(() => emitter.emit('mounted', { el: route.el })) - }, render: h => h(route.component), }) } diff --git a/resources/assets/src/views/admin/Market.vue b/resources/assets/src/views/admin/Market.vue index eaec0af5..7a720e0d 100644 --- a/resources/assets/src/views/admin/Market.vue +++ b/resources/assets/src/views/admin/Market.vue @@ -86,6 +86,7 @@ import { VueGoodTable } from 'vue-good-table' import 'vue-good-table/dist/vue-good-table.min.css' import enablePlugin from '../../components/mixins/enablePlugin' import tableOptions from '../../components/mixins/tableOptions' +import emitMounted from '../../components/mixins/emitMounted' export default { name: 'Market', @@ -93,6 +94,7 @@ export default { VueGoodTable, }, mixins: [ + emitMounted, enablePlugin, tableOptions, ], diff --git a/resources/assets/src/views/admin/Players.vue b/resources/assets/src/views/admin/Players.vue index 61615058..4482d6b0 100644 --- a/resources/assets/src/views/admin/Players.vue +++ b/resources/assets/src/views/admin/Players.vue @@ -116,6 +116,7 @@ import { VueGoodTable } from 'vue-good-table' import 'vue-good-table/dist/vue-good-table.min.css' import tableOptions from '../../components/mixins/tableOptions' import serverTable from '../../components/mixins/serverTable' +import emitMounted from '../../components/mixins/emitMounted' export default { name: 'PlayersManagement', @@ -123,6 +124,7 @@ export default { VueGoodTable, }, mixins: [ + emitMounted, tableOptions, serverTable, ], diff --git a/resources/assets/src/views/admin/Plugins.vue b/resources/assets/src/views/admin/Plugins.vue index 5cb3cfab..577e92d5 100644 --- a/resources/assets/src/views/admin/Plugins.vue +++ b/resources/assets/src/views/admin/Plugins.vue @@ -79,6 +79,7 @@ import { VueGoodTable } from 'vue-good-table' import 'vue-good-table/dist/vue-good-table.min.css' import enablePlugin from '../../components/mixins/enablePlugin' import tableOptions from '../../components/mixins/tableOptions' +import emitMounted from '../../components/mixins/emitMounted' export default { name: 'Plugins', @@ -86,6 +87,7 @@ export default { VueGoodTable, }, mixins: [ + emitMounted, enablePlugin, tableOptions, ], diff --git a/resources/assets/src/views/admin/Reports.vue b/resources/assets/src/views/admin/Reports.vue index 54921fe1..b653e16f 100644 --- a/resources/assets/src/views/admin/Reports.vue +++ b/resources/assets/src/views/admin/Reports.vue @@ -51,6 +51,7 @@ import { VueGoodTable } from 'vue-good-table' import 'vue-good-table/dist/vue-good-table.min.css' import tableOptions from '../../components/mixins/tableOptions' import serverTable from '../../components/mixins/serverTable' +import emitMounted from '../../components/mixins/emitMounted' export default { name: 'ReportsManagement', @@ -58,6 +59,7 @@ export default { VueGoodTable, }, mixins: [ + emitMounted, tableOptions, serverTable, ], diff --git a/resources/assets/src/views/admin/Update.vue b/resources/assets/src/views/admin/Update.vue index 9ad84904..741eec7e 100644 --- a/resources/assets/src/views/admin/Update.vue +++ b/resources/assets/src/views/admin/Update.vue @@ -42,10 +42,15 @@