@concretecms/bedrock 1.4.1 → 1.4.3

package/assets/bedrock/js/frontend.js

@@ -2,8 +2,6 @@ import jQuery from 'jquery'
 import 'bootstrap'
 // We will be refactoring this, also it causes problems with installation.
 // import './frontend/async-thumbnail-builder'
-import './frontend/locations/country-data-link'
-import './frontend/locations/country-stateprovince-link'
 
 // Let us use Vue with our theme JS
 import VueManager from '../../../assets/cms/js/vue/Manager'

package/assets/cms/components/Announcement/Broadcast.vue

@@ -13,7 +13,7 @@
     </div>
 </template>
 <script>
-/* global bootstrap */
+/* global bootstrap ConcreteModal */
 import ConcreteAnnouncementModal from './Modal/Modal'
 
 export default {
@@ -58,6 +58,8 @@ export default {
         if (modal) {
             modal.show()
         }
+        ConcreteModal.fixBackdrop()
+        $('#concrete-announcement-modal').appendTo('#ccm-tooltip-holder')
     }
 }
 </script>

package/assets/cms/js/modal.js

@@ -9,6 +9,9 @@ import bootbox from 'bootbox'
 class ConcreteModal {
     openExternal(url, title, options) {
         var my = this
+        if (!options) {
+            options = {}
+        }
         new ConcreteAjaxRequest({
             url: url,
             dataType: 'html',
@@ -20,6 +23,10 @@ class ConcreteModal {
         })
     }
 
+    static fixBackdrop(element = '#ccm-tooltip-holder') {
+        $('.modal-backdrop').appendTo(element)
+    }
+
     show(options) {
         options = $.extend(options, {
             className: 'ccm-ui',
@@ -57,17 +64,12 @@ class ConcreteModal {
         // dialog._config.backdrop = 'static'
         dialog.show()
 
+        ConcreteModal.fixBackdrop(options.container)
+
         if (options.backdrop === 'static') {
             dialog._config.backdrop = 'static'
         }
-
-        element.addEventListener('hide.bs.modal', function() {
-            ConcreteModal.totalOpen--
-        })
-        ConcreteModal.totalOpen++
     }
 }
 
-ConcreteModal.totalOpen = 0
-
 global.ConcreteModal = ConcreteModal

package/assets/cms/scss/_transitions.scss

@@ -37,4 +37,13 @@
   opacity: 0;
 }
 
-
+/**
+ * Fix for https://github.com/concretecms/concretecms/issues/11306
+ * Old Bootstrap 3 themes will cause this. BS3 used to set .fade {opacity: 0} right within
+ * the global namespace. Bootstrap 4/5 fix this by setting that to .fade(not(.show)), but unless
+ * the BS3 root fade is reverted then it will override our updates and bootstrap modals will not work
+ * on the frontend. This should fix that.
+ */
+.fade {
+  opacity: revert;
+}

package/assets/conversations/js/frontend/conversations.js

@@ -130,7 +130,9 @@ window._ = _
                         var target = $('a' + window.location.hash).offset()
                         $('html, body').animate({ scrollTop: target.top }, 800, 'linear')
                     }
-                    window.obj = oldobj
+                    if (oldobj) {
+                        window.obj = oldobj
+                    }
                     obj.attachBindings()
                     obj.publish('conversationLoaded')
                 })

package/assets/{bedrock/js/frontend/locations → forms/js/frontend}/country-data-link.js

@@ -1,3 +1,4 @@
+/* eslint-disable eqeqeq */
 var USE_MUTATIONOBSERVER = !!(window.MutationObserver && window.MutationObserver.prototype && window.MutationObserver.prototype.observe)
 
 function loadDataForCountry(countryCode, callback) {
@@ -185,7 +186,7 @@ Link.prototype = {
                         .val(spCode)
                         .text(name)
 
-                    if (spCode === selectedStateprovince) {
+                    if (spCode == selectedStateprovince) {
                         $o.attr('selected', 'selected')
                     }
                     me.$stateprovinceSelect.append($o)

package/assets/forms/js/frontend.js

@@ -0,0 +1,2 @@
+import './frontend/country-stateprovince-link'
+import './frontend/country-data-link'

package/assets/staging/scss/frontend/_frontend.scss

@@ -1,3 +1,5 @@
+@import 'variables';
+
 div.ccm-production-notice-staging {
   background-color: black;
   bottom: 0;
@@ -8,5 +10,5 @@ div.ccm-production-notice-staging {
   position: fixed;
   text-align: center;
   width: 100%;
-  z-index: 1000;
+  z-index: $index-level-stage-notice;
 }

package/assets/staging/scss/frontend/_variables.scss

@@ -0,0 +1 @@
+$index-level-stage-notice: 820 !default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",