@concretecms/bedrock 1.4.14 → 1.5.0

package/assets/calendar/js/backend/duration.js

@@ -131,10 +131,12 @@
 
         setupTimes: function () {
             var my = this
+            var config = {}
+            config.maxOptions = null
             var $startTime = my.$element.find('select[data-select=start-time]')
             var $endTime = my.$element.find('select[data-select=end-time]')
-            var startTimeSelect = new TomSelect($startTime.get(0))
-            var endTimeSelect = new TomSelect($endTime.get(0))
+            var startTimeSelect = new TomSelect($startTime.get(0), config)
+            var endTimeSelect = new TomSelect($endTime.get(0), config)
 
             $startTime.data('TomSelect', startTimeSelect)
             $startTime.on('change', function () {

package/assets/cms/components/file-manager/Uploader/UploadFromComputer.vue

@@ -68,6 +68,10 @@ export default {
             type: Number,
             required: false,
             default: null
+        },
+        reloadOnReplace: {
+            type: Boolean,
+            default: false
         }
     },
     computed: {
@@ -274,6 +278,10 @@ export default {
             this.dropzone.processQueue()
         },
         uploadComplete(fileIds) {
+            if (this.replaceFileId && fileIds && fileIds.length && this.reloadOnReplace) {
+                window.location.reload()
+                return
+            }
             this.$emit('upload-complete', fileIds)
 
             ConcreteAlert.notify({

package/assets/cms/js/edit-mode/area.js

@@ -341,11 +341,11 @@
                 if (my.getDragAreas().length) {
                     throw new Error('No block supplied')
                 }
-                elem = $('<div class="ccm-area-drag-area"/>')
+                elem = $('<div class="ccm-area-drag-area ccm-ui"/>')
                 drag_area = new Concrete.DragArea(elem, my, block)
                 my.getBlockContainer().prepend(elem)
             } else {
-                elem = $('<div class="ccm-area-drag-area"/>')
+                elem = $('<div class="ccm-area-drag-area ccm-ui"/>')
                 drag_area = new Concrete.DragArea(elem, my, block)
                 block.getContainer().after(elem)
             }

package/assets/cms/js/tree.js

@@ -138,11 +138,11 @@ ConcreteTree.prototype = {
             },
             select: function (select, data) {
                 if (options.chooseNodeInForm) {
-                    var keys = $.map(data.tree.getSelectedNodes(), function (node) {
-                        return node.key
-                    })
+                    const keys = my.getSelectedNodeKeys(data.tree.getRootNode(), ajaxData.treeNodeSelectedIDs)
+                    if (keys.length) {
                     options.onSelect(keys)
                 }
+                }
             },
 
             selectMode: selectMode,
@@ -168,12 +168,9 @@ ConcreteTree.prototype = {
 
                 var selectedNodes
                 if (options.chooseNodeInForm) {
-                    selectedNodes = $.ui.fancytree.getTree($tree)
-                    selectedNodes = selectedNodes.getSelectedNodes()
-                    if (selectedNodes.length) {
-                        var keys = $.map(selectedNodes, function (node) {
-                            return node.key
-                        })
+                    const tree = $.ui.fancytree.getTree($tree)
+                    const keys = my.getSelectedNodeKeys(tree.getRootNode(), ajaxData.treeNodeSelectedIDs)
+                    if (keys.length) {
                         options.onSelect(keys)
                     }
                 }
@@ -310,6 +307,30 @@ ConcreteTree.prototype = {
         })
     },
 
+    getSelectedNodeKeys: function (node, selected) {
+        var my = this
+
+        // Initialize selected and deselected arrays
+        selected = selected || []
+        // Walk through all child nodes
+        if (node.hasChildren()) {
+            node.getChildren().forEach(function (child) {
+                // If the node is selected and not already in the selected array, add it
+                if (child.isSelected() && !selected.includes(parseInt(child.key))) {
+                    selected.push(parseInt(child.key))
+                }
+                // If the node is not selected and is in the selected array, remove it
+                if (!child.isSelected() && selected.includes(parseInt(child.key))) {
+                    selected.splice(selected.indexOf(parseInt(child.key)), 1)
+                }
+                // call the function recursively and merge the result with the selected array
+                selected = my.getSelectedNodeKeys(child, selected)
+            })
+        }
+
+        return selected
+    },
+
     getLoadNodePromise: function (node) {
         var my = this
         var ajaxData = my.options.ajaxData != false ? my.options.ajaxData : {}

package/assets/cms/scss/_page-areas.scss

@@ -689,7 +689,7 @@ div#ccm-menu-highlighter.ccm-block-highlight {
  */
 div.ccm-area-drag-area {
   height: 0;
-  line-height: 0;
+  line-height: 0 !important; // This needs !important so it overrides the line height set on .ccm-ui
   transition: none;
 
   span {

package/assets/cms/scss/_tables.scss

@@ -102,7 +102,7 @@ div.ccm-ui {
     }
 
     tbody + tbody {
-      border-top: (2 * $table-border-width) solid $table-border-color;
+      border-top: calc(var(--bs-border-width) * 2) solid $table-border-color;
     }
 
     .ccm-search-results-em,

package/assets/cms/scss/_type.scss

@@ -1,7 +1,7 @@
 // Note - ideally these font families should be handled by Bootstrap but when using with
 // A bootstrap theme the font family from the theme can sometimes take precedence. So let's
 // redeclare it here as well.
-body div.ccm-ui {
+body .ccm-ui {
   h1,
   .h1 {
     font-family: $headings-font-family;

package/assets/cms/scss/bootstrap/_reboot.scss

@@ -20,7 +20,7 @@
 }
 
 
-body div.ccm-ui { // Added body for extra specificity
+body .ccm-ui { // Added body for extra specificity
   margin: 0; // 1
   font-family: var(--#{$prefix}body-font-family);
   // Concrete CMS

package/assets/cms/scss/jquery-ui/_overrides.scss

@@ -107,15 +107,15 @@ html.ccm-toolbar-visible {
   }
 
   .ui-widget {
-    font-family: inherit;
+    font-family: var(--bs-body-font-family); // Should inherit this variable from a wrapping .ccm-ui class.
   }
 
   .ui-widget-header {
-    color: inherit;
+    color: var(--bs-body-color); // Should inherit this variable from a wrapping .ccm-ui class.
   }
 
   .ui-widget-content {
-    color: inherit; // These inherits ensure that this comes from bootstrap not jQuery UI
+    color: var(--bs-body-color); // Should inherit this variable from a wrapping .ccm-ui class.
   }
 
   .ui-widget-overlay {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.4.14",
+  "version": "1.5.0",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",
@@ -12,14 +12,13 @@
     "storybook": "start-storybook -p55600 -s./.storybook/public"
   },
   "dependencies": {
-    "@concretecms/bedrock": "^1.4.13",
     "@fortawesome/fontawesome-free": "^5.15.1",
     "ace-builds": "^1.4.12",
     "ajax-bootstrap-select": "^1.4.5",
     "backstretch": "^1.2.2",
     "blueimp-file-upload": "^10.31.0",
     "bootbox": "github:makeusabrew/bootbox#master",
-    "bootstrap": "5.2.3",
+    "bootstrap": "5.3.3",
     "bootstrap-select": "github:snapappointments/bootstrap-select",
     "bootstrap-tourist": "git+https://git@github.com/concrete5/bootstrap-tourist.git",
     "check-password-strength": "^2.0.7",