From cc079cf9e06e2f601bfb6aa7f1e615ee7ac126d8 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Mon, 2 Mar 2020 16:54:44 -0300 Subject: [PATCH] Registers extra vue components inside global variables of window. #349. --- .eslintrc.js | 4 +++- src/views/admin/js/main.js | 15 +++++++++------ src/views/theme-search/js/theme-main.js | 18 +++++++++++------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a54407184..ad2d4d2de 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -21,6 +21,8 @@ module.exports = { globals: { 'tainacan_plugin': true, '_': true, - 'jQuery': true + 'jQuery': true, + 'tainacan_extra_components': true, + 'tainacan_extra_plugins': true } } \ No newline at end of file diff --git a/src/views/admin/js/main.js b/src/views/admin/js/main.js index 654284250..757a2bde9 100644 --- a/src/views/admin/js/main.js +++ b/src/views/admin/js/main.js @@ -55,9 +55,9 @@ import eventBusSearch from './event-bus-search'; import eventBusTermsList from './event-bus-terms-list.js'; import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin, StatusHelperPlugin, CommentsStatusHelperPlugin } from './utilities'; -/* Registers Extra Vue Pluginss passed to the TainacanExtraVuePlugins */ -if (typeof TainacanExtraVuePlugins != "undefined") { - for (let [extraVuePluginName, extraVuePluginObject] of Object.entries(TainacanExtraVuePlugin)) +/* Registers Extra Vue Plugins passed to the window.tainacan_extra_plugins */ +if (typeof window.tainacan_extra_plugins != "undefined") { + for (let [extraVuePluginName, extraVuePluginObject] of Object.entries(window.tainacan_extra_plugins)) Vue.use(extraVuePluginObject); } @@ -76,10 +76,13 @@ Vue.use(ConsolePlugin, {visual: false}); Vue.use(VueTheMask); Vue.use(CommentsStatusHelperPlugin); -/* Registers Extra Vue Components passed to the TainacanExtraVueComponents */ -if (typeof TainacanExtraVueComponents != "undefined") { - for (let [extraVueComponentName, extraVueComponentObject] of Object.entries(TainacanExtraVueComponents)) + +/* Registers Extra Vue Components passed to the window.tainacan_extra_components */ +if (typeof window.tainacan_extra_components != "undefined") { + for (let [extraVueComponentName, extraVueComponentObject] of Object.entries(window.tainacan_extra_components)) { Vue.component(extraVueComponentName, extraVueComponentObject); + console.log(extraVueComponentName, extraVueComponentObject) + } } /* Metadata */ diff --git a/src/views/theme-search/js/theme-main.js b/src/views/theme-search/js/theme-main.js index 8fd16f652..8c65d34f8 100644 --- a/src/views/theme-search/js/theme-main.js +++ b/src/views/theme-search/js/theme-main.js @@ -35,10 +35,12 @@ import routerTheme from './theme-router.js'; import eventBusSearch from '../../admin/js/event-bus-search'; import { I18NPlugin, UserPrefsPlugin, ConsolePlugin } from '../../admin/js/utilities'; -/* Registers Extra Vue Pluginss passed to the TainacanExtraVuePlugins */ -if (typeof TainacanExtraVuePlugins != "undefined") { - for (let [extraVuePluginName, extraVuePluginObject] of Object.entries(TainacanExtraVuePlugin)) - Vue.use(extraVuePluginObject); +/* Registers Extra Vue Plugins passed to the window.tainacan_extra_plugins */ +if (typeof window.tainacan_extra_plugins != "undefined") { + for (let [extraVuePluginName, extraVuePluginObject] of Object.entries(window.tainacan_extra_plugins)) { + Vue.component(extraVuePluginName, extraVuePluginObject); + console.log(extraVuePluginName, extraVuePluginObject) + } } // Configure and Register Plugins @@ -51,10 +53,12 @@ Vue.use(I18NPlugin); Vue.use(UserPrefsPlugin); Vue.use(ConsolePlugin, {visual: false}); -/* Registers Extra Vue Components passed to the TainacanExtraVueComponents */ -if (typeof TainacanExtraVueComponents != "undefined") { - for (let [extraVueComponentName, extraVueComponentObject] of Object.entries(TainacanExtraVueComponents)) +/* Registers Extra Vue Components passed to the window.tainacan_extra_components */ +if (typeof window.tainacan_extra_components != "undefined") { + for (let [extraVueComponentName, extraVueComponentObject] of Object.entries(window.tainacan_extra_components)) { Vue.component(extraVueComponentName, extraVueComponentObject); + console.log(extraVueComponentName, extraVueComponentObject) + } } Vue.component('tainacan-filter-item', TaincanFiltersList);