Bootstrap 4 dropdowns in front-end require two clicks to activate con…

…cretecms#8938
martbase · Aug 21, 2020 · ff79adf · ff79adf
1 parent aec50c0
commit ff79adf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/application/bootstrap/app.php b/application/bootstrap/app.php
@@ -65,4 +65,4 @@
  *   );
  *
  * ----------------------------------------------------------------------------
- */
+ */
diff --git a/build/assets/cms.js b/build/assets/cms.js
@@ -1,11 +1,2 @@
 // Include core libraries for panels, etc...
 import "@concretecms/bedrock/assets/cms/js/base";
-
-// Import only the bootstrap libraries required for the CMS domain.
-import "bootstrap/js/dist/tooltip";
-import "bootstrap/js/dist/popover";
-import "bootstrap/js/dist/tab";
-import "bootstrap/js/dist/toast";
-import "bootstrap/js/dist/modal";
-import "bootstrap/js/dist/dropdown";
-import "bootstrap/js/dist/collapse";
diff --git a/build/webpack.mix.js b/build/webpack.mix.js
@@ -8,6 +8,7 @@ mix.webpackConfig({
     },
     externals: {
         jquery: 'jQuery',
+        bootstrap: true,
         vue: 'Vue'
     },
     // Override the default js compile settings to replace exclude with something that doesn't exclude node_modules.

diff --git a/concrete/config/app.php b/concrete/config/app.php
@@ -399,6 +399,17 @@
             ],
         ],
 
+        'bootstrap' => [
+            [
+                'javascript',
+                'js/bootstrap.js',
+                [
+                    'position' => Asset::ASSET_POSITION_FOOTER,
+                    'version' => '4.0.0'
+                ]
+            ]
+        ],
+
         // This is the base CKEditor library from CKEditor
         'ckeditor' => [
             [
@@ -528,6 +539,12 @@
             ],
         ],
 
+        'bootstrap' => [
+            [
+                ['javascript', 'bootstrap']
+            ],
+        ],
+
         'vue' => [
             [
                 ['javascript', 'vue'],
@@ -555,6 +572,7 @@
         'core/cms' => [
             [
                 ['javascript', 'jquery'],
+                ['javascript', 'bootstrap'],
                 ['javascript', 'vue'],
                 ['css', 'font-awesome'],
                 ['javascript', 'core/cms'],

diff --git a/concrete/src/Page/Theme/BedrockThemeTrait.php b/concrete/src/Page/Theme/BedrockThemeTrait.php
@@ -14,6 +14,7 @@ public function registerAssets()
         $this->requireAsset('font-awesome');
         $this->requireAsset('jquery');
         $this->requireAsset('vue');
+        $this->requireAsset('bootstrap');
     }
 
     public function getThemeGridFrameworkHandle(): string
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,4 +65,4 @@ @@
      *   );
      *
      * ----------------------------------------------------------------------------
-     */
+     */