From 05f8b8d8afacf4d4e3a9424048a3bbd1e595932e Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Fri, 15 Nov 2019 13:56:03 +0100 Subject: [PATCH 1/2] Fix script order in main bundle creative.js relies on ScrollReveal being present on initialization, so it has to be included after scrollreveal.min.js --- BTCPayServer/bundleconfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json index 0f1ea05ae..9da088d34 100644 --- a/BTCPayServer/bundleconfig.json +++ b/BTCPayServer/bundleconfig.json @@ -15,13 +15,13 @@ "inputFiles": [ "wwwroot/vendor/jquery/jquery.js", "wwwroot/vendor/popper/popper.js", - "wwwroot/main/bootstrap/bootstrap.js", - "wwwroot/main/bootstrap4-creativestart/creative.js", "wwwroot/vendor/jquery-easing/jquery.easing.js", "wwwroot/vendor/scrollreveal/scrollreveal.min.js", "wwwroot/vendor/magnific-popup/jquery.magnific-popup.js", "wwwroot/vendor/moment/moment.min.js", "wwwroot/vendor/flatpickr/flatpickr.js", + "wwwroot/main/bootstrap/bootstrap.js", + "wwwroot/main/bootstrap4-creativestart/creative.js", "wwwroot/main/site.js" ] }, From a2f608266b7c9ff97af3cb0a1ac545a5cc42f32a Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Fri, 15 Nov 2019 14:01:18 +0100 Subject: [PATCH 2/2] Fix bootstrap reference in cart bundle --- BTCPayServer/bundleconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json index 9da088d34..e71cd9c6f 100644 --- a/BTCPayServer/bundleconfig.json +++ b/BTCPayServer/bundleconfig.json @@ -70,7 +70,7 @@ "outputFileName": "wwwroot/bundles/cart-bundle.min.js", "inputFiles": [ "wwwroot/vendor/jquery/jquery.js", - "wwwroot/vendor/bootstrap/bootstrap.js", + "wwwroot/main/bootstrap/bootstrap.js", "wwwroot/cart/js/cart.js", "wwwroot/cart/js/cart.jquery.js" ]