From bea81e4aa3798b91006fc56ad39d713503b15ae5 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Tue, 23 Nov 2021 10:12:49 +0100
Subject: [PATCH] Since Bootstrap 5 is using popper v2, we can use the
 bootstrap.min.js file directly

---
 application/views/layouts/account/account_layout.php            | 2 +-
 application/views/layouts/backend/backend_layout.php            | 2 +-
 application/views/layouts/booking/booking_layout.php            | 2 +-
 application/views/layouts/message/message_layout.php            | 2 +-
 application/views/pages/instance/instance_installation_page.php | 2 +-
 gulpfile.js                                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/layouts/account/account_layout.php b/application/views/layouts/account/account_layout.php
index 98dda777..42ffd5c0 100644
--- a/application/views/layouts/account/account_layout.php
+++ b/application/views/layouts/account/account_layout.php
@@ -29,7 +29,7 @@
     <script src="<?= asset_url('assets/vendor/jquery/jquery.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/@popperjs-core/popper.min.js') ?>"></script>
-    <script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.bundle.min.js') ?>"></script>
+    <script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/datejs/date.min.js') ?>"></script>
 
     <script>
diff --git a/application/views/layouts/backend/backend_layout.php b/application/views/layouts/backend/backend_layout.php
index 7180e1e7..13e983a0 100644
--- a/application/views/layouts/backend/backend_layout.php
+++ b/application/views/layouts/backend/backend_layout.php
@@ -35,7 +35,7 @@
 
     <script src="<?= asset_url('assets/vendor/jquery/jquery.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/@popperjs-core/popper.min.js') ?>"></script>
-    <script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.bundle.min.js') ?>"></script>
+    <script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/tippy.js/tippy-bundle.umd.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.js') ?>"></script>
     <script src="<?= asset_url('assets/vendor/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js') ?>"></script>
diff --git a/application/views/layouts/booking/booking_layout.php b/application/views/layouts/booking/booking_layout.php
index 2976d476..9621a54f 100644
--- a/application/views/layouts/booking/booking_layout.php
+++ b/application/views/layouts/booking/booking_layout.php
@@ -95,7 +95,7 @@
 <script src="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/cookieconsent/cookieconsent.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@popperjs-core/popper.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.bundle.min.js') ?>"></script>
+<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/tippy.js/tippy-bundle.umd.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/datejs/date.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/moment/moment.min.js') ?>"></script>
diff --git a/application/views/layouts/message/message_layout.php b/application/views/layouts/message/message_layout.php
index d4bc13a2..ef4ca382 100644
--- a/application/views/layouts/message/message_layout.php
+++ b/application/views/layouts/message/message_layout.php
@@ -45,7 +45,7 @@
 
 <script src="<?= asset_url('assets/vendor/jquery/jquery.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@popperjs-core/popper.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.bundle.min.js') ?>"></script>
+<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 
 <?php google_analytics_script() ?>
diff --git a/application/views/pages/instance/instance_installation_page.php b/application/views/pages/instance/instance_installation_page.php
index b487f703..067c48dc 100755
--- a/application/views/pages/instance/instance_installation_page.php
+++ b/application/views/pages/instance/instance_installation_page.php
@@ -145,7 +145,7 @@
 <script src="<?= asset_url('assets/vendor/jquery/jquery.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@popperjs-core/popper.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.bundle.min.js') ?>"></script>
+<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/datejs/date.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 <script src="<?= asset_url('assets/js/installation.js') ?>"></script>
diff --git a/gulpfile.js b/gulpfile.js
index e28a5f5a..cc9df003 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -113,7 +113,7 @@ function vendor(done) {
 
     // bootstrap
     gulp.src([
-        'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js',
+        'node_modules/bootstrap/dist/js/bootstrap.min.js',
         'node_modules/bootstrap/dist/css/bootstrap.min.css'
     ]).pipe(gulp.dest('assets/vendor/bootstrap'));