@concretecms/bedrock 1.6.0 → 1.6.2

package/assets/cms/components/file-manager/Chooser.vue

@@ -152,10 +152,16 @@ export default {
                 }
             }
         }
+
         this.applyLocalization()
         ConcreteEvent.subscribe('FileUploaderFilesReadyToUpload', function(e, filesReadyToUpload) {
             my.filesReadyToUpload = filesReadyToUpload
         })
+
+        const fileChooserItemKey = $.cookie('ConcreteFileChooserItemKey')
+        if (fileChooserItemKey) {
+            this.activateTabByKey(fileChooserItemKey)
+        }
     },
     watch: {
         choosers() {
@@ -222,12 +228,12 @@ export default {
         activateTabByKey(key) {
             var my = this
             this.choosers.forEach(function(chooser) {
-                if (chooser.id === key) {
+                if (chooser.componentKey === key) {
                     my.activateTab(chooser)
                 }
             })
             this.uploaders.forEach(function(uploader) {
-                if (uploader.id === key) {
+                if (uploader.componentKey === key) {
                     my.activateTab(uploader)
                 }
             })
@@ -235,6 +241,9 @@ export default {
         activateTab(item) {
             this.activeNavItem = item
 
+            // Store the last selected tab ID in a cookie (expires in 7 days)
+            $.cookie('ConcreteFileChooserItemKey', item.componentKey, { expires: 7, path: '/' })
+
             // Reset Selected Files because the component always rerender after Tab switch
             // Otherwise we have to use keep-alive built-in component [@see https://vuejs.org/v2/api/#keep-alive]
             // to keep selection from different Tabs

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

@@ -16,6 +16,6 @@ $(window).on('mousemove keydown keyup', function() {
         cache: false,
         dataType: 'json',
         type: 'GET',
-        url: CCM_DISPATCHER_FILENAME + '/ccm/system/heartbeat'
+        url: CCM_DISPATCHER_FILENAME + '/ccm/system/heartbeat?cID=' + (Number(window.CCM_CID) || '')
     })
 })

package/assets/cms/js/legacy-dialog.js

@@ -277,6 +277,8 @@
         var finalSettings = { autoOpen: false, data: {} }
         $.extend(finalSettings, defaults, options)
 
+        finalSettings.classes = { 'ui-dialog': finalSettings.dialogClass }
+
         if (finalSettings.element) {
             $(finalSettings.element).jqdialog(finalSettings).jqdialog()
             $(finalSettings.element).jqdialog('open')

package/assets/cms/js/sitemap/sitemap-selector.js

@@ -33,20 +33,48 @@
             },
             init: function() {
                 if (options.selected) {
-                    if (options.mode == 'multiple') {
-                        $.each(options.selected, function(i, cID) {
-                            var node = $.ui.fancytree.getTree(my.$element.find('.ccm-sitemap-tree')).getNodeByKey(String(cID))
+                    var tree = $.ui.fancytree.getTree(my.$element.find('.ccm-sitemap-tree'))
+
+                    var paths
+                    if (options.mode === 'multiple') {
+                        paths = options.selectedPath.map(pathGroup => pathGroup.map(String))
+                    } else {
+                        paths = []
+                        paths.push(options.selectedPath.map(String))
+                    }
+
+                    var promise = Promise.resolve()
+
+                    paths.forEach(function(pathGroup) {
+                        pathGroup.forEach(function(nodeKey) {
+                            promise = promise.then(function() {
+                                var node = tree.getNodeByKey(nodeKey)
+                                if (node) {
+                                    return node.setExpanded(true)
+                                }
+                            })
+                        })
+
+                        promise = promise.then(function() {
+                            return Promise.resolve()
+                        })
+                    })
+
+                    promise.then(function() {
+                        if (options.mode === 'multiple') {
+                            options.selected.forEach(function(cID) {
+                                var node = tree.getNodeByKey(String(cID))
+                                if (node) {
+                                    node.setSelected(true)
+                                }
+                            })
+                        } else {
+                            var node = tree.getNodeByKey(String(options.selected))
                             if (node) {
                                 node.setSelected(true)
                             }
-                        })
-                    } else {
-                        var tree = $.ui.fancytree.getTree(my.$element.find('.ccm-sitemap-tree'))
-                        var node = tree.getNodeByKey(String(options.selected))
-                        if (node) {
-                            node.setSelected(true)
                         }
-                    }
+                    })
                 }
             },
             onSelectNode: function(node, flag) {

package/assets/cms/scss/_sitemap.scss

@@ -219,9 +219,9 @@
 
 @include color-mode(dark) {
   .ccm-ui {
-    .ccm-sitemap-tree {
-      ul.ui-fancytree {
-        li[role=treeitem] {
+    ul.ui-fancytree {
+      li[role=treeitem] {
+        span.fancytree-node {
           span.fancytree-expander,
           span.icon-folder,
           span.icon-home,

package/assets/cms/scss/_variables.scss

@@ -63,7 +63,7 @@ $form-select-border-color: rgb(235, 235, 235);
 $form-select-box-shadow: 0 0;
 $input-border-radius: 4px;
 //$input-border-width: 1px;
-$input-color: $dark-blue;
+//$input-color: $dark-blue;
 $input-padding-y: 0.5rem;
 $label-margin-bottom: 0.4rem;
 $input-box-shadow: inset 0 0;

package/assets/cms/scss/panels/_shared.scss

@@ -607,12 +607,22 @@ div.ccm-panel-content {
 }
 
 @include color-mode(dark) {
-  header {
-    a {
-      color: $gray-400;
+  div.ccm-panel-content {
+    header {
+      a {
+        color: $gray-400;
 
-      svg {
-        fill: $gray-400;
+        svg {
+          fill: $gray-400;
+        }
+
+        &:hover {
+          color: $blue;
+
+          svg {
+            fill: $blue;
+          }
+        }
       }
     }
   }

package/assets/cms/scss/panels/add/_blocks.scss

@@ -145,4 +145,4 @@ a.ccm-panel-add-block-draggable-block-type.ccm-stacked-list {
   a.ccm-panel-add-container-item {
     color: $light;
   }
-}
+}

package/assets/cms/scss/panels/pages/_attributes.scss

@@ -178,9 +178,11 @@
 
 @include color-mode(dark) {
   #ccm-detail-page-attributes {
-    &[data-attribute-key-id] {
-      background-color: $panel-background-color-dark;
-      border: 2px solid lighten($panel-background-color-dark, 0.3);
+    .form-group {
+      &[data-attribute-key-id] {
+        background-color: $panel-background-color-dark;
+        border: 2px solid lighten($panel-background-color-dark, 0.3);
+      }
     }
   }
 

package/package.json

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