@concretecms/bedrock 1.4.2 → 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/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',

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/package.json

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