Fix issue conflict JS with Joomla Bootstrap #775

templaza · Aug 27, 2024 · 49b82f8 · 49b82f8
1 parent 86432d4
commit 49b82f8
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 71 deletions.
diff --git a/assets/vendor/manager/dist/index.html b/assets/vendor/manager/dist/index.html
diff --git a/assets/vendor/manager/dist/index.js b/assets/vendor/manager/dist/index.js
diff --git a/assets/vendor/manager/index.html b/assets/vendor/manager/index.html
diff --git a/assets/vendor/manager/src/App.vue b/assets/vendor/manager/src/App.vue
@@ -4,7 +4,6 @@ import Container from "./components/Container.vue";
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircle, faArrowsLeftRight, faTrash, faDownload } from "@fortawesome/free-solid-svg-icons";
 import { onBeforeMount, provide, ref } from "vue";
-import { Tooltip, Toast, Modal } from 'bootstrap/js/index.esm'
 import 'bootstrap/scss/bootstrap.scss'
 import './assets/base.scss'
 library.add(faCircle, faArrowsLeftRight, faTrash, faDownload);
@@ -13,9 +12,9 @@ const theme = ref('light');
 provide('theme', theme);
 provide('constant', astroid_config.astroid_lib);
 provide('language', astroid_config.astroid_lang);
-window.Tooltip = Tooltip;
-window.Toast = Toast;
-window.Modal = Modal;
+window.Tooltip = bootstrap.Tooltip;
+window.Toast = bootstrap.Toast;
+window.Modal = bootstrap.Modal;
 onBeforeMount(()=>{
   const colorMode = getCookie('astroid_colormode');
   if (colorMode) {

diff --git a/framework/library/astroid/Admin.php b/framework/library/astroid/Admin.php
@@ -242,6 +242,7 @@ protected function manager()
         Framework::getDebugger()->log('Loading Languages');
         $document->addScript('media/system/js/core.min.js');
         $document->addScript('media/system/js/keepalive.min.js');
+        $document->addScript('vendor/bootstrap/js/bootstrap.bundle.min.js');
         $document->addScript('vendor/manager/dist/index.js', 'body', [], [], 'module');
         $pluginParams   =   Helper::getPluginParams();
         $plg_color_mode =   $pluginParams->get('astroid_color_mode_enable', 0);