@concretecms/bedrock 1.2.7 → 1.3.0

package/assets/cms/components/customizer/ThemeCustomizer.vue

@@ -150,7 +150,7 @@ export default {
             new ConcreteAjaxRequest({
                 url: my.saveStylesAction,
                 data: {
-                    styles: my.customizerStyles,
+                    styles: JSON.stringify(my.customizerStyles),
                     customCss: my.customizerCustomCss,
                     applyTo: my.applyTo,
                     ccm_token: CCM_SECURITY_TOKEN

package/assets/cms/components/form/IconSelector.vue

@@ -11,8 +11,7 @@ import { icons } from '../iconlist'
 export default {
     data() {
         return {
-            selectedOption: this.selected,
-            emptyOptionLabel: this.emptyOptionLabel
+            selectedOption: this.selected
         }
     },
     props: {

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

@@ -14,7 +14,7 @@
     })
 
     function onDialogCreate($dialog) {
-        $dialog.parent().addClass('animated fadeIn')
+        // $dialog.parent().addClass('animated fadeIn')
     }
 
     function onDialogOpen($dialog) {
@@ -33,7 +33,11 @@
         var overlays = $('.ui-widget-overlay').length
 
         if (overlays == 1) {
-            $('.ui-widget-overlay').addClass('ui-widget-overlay-active')
+            var overlayFunction = function() {
+                var overlay = $('.ui-widget-overlay').get(0)
+                overlay.classList.add('ui-widget-overlay-active')
+            }
+            requestAnimationFrame(overlayFunction)
         }
 
         var $close = $dialog.parent().find('.ui-dialog-titlebar-close')

package/assets/cms/js/tree.js

@@ -75,6 +75,12 @@ ConcreteTree.prototype = {
             ajaxData.allowFolderSelection = 1
         }
 
+        if (typeof CCM_CID !== 'undefined') {
+            ajaxData.cID = CCM_CID
+        } else {
+            ajaxData.cID = 0
+        }
+
         var persist = true
 
         if (options.chooseNodeInForm) {

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

@@ -514,3 +514,11 @@ div.ccm-block-edit[data-block-type-handle=core_container] {
     }
   }
 }
+
+/**
+ * Dragging performance. We have to change this because BS5 sets it to to smooth which botches drag operations. See
+ * issue https://github.com/concretecms/concretecms/issues/10701
+ */
+html.ccm-edit-mode {
+  scroll-behavior: auto;
+}

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

@@ -120,7 +120,8 @@ html.ccm-toolbar-visible {
 
   .ui-widget-overlay {
     opacity: 0;
-    transition: $transition-fade;
+    transition: opacity 0.2s linear;
+    will-change: opacity;
 
     &.ui-widget-overlay-active {
       background: $modal-backdrop-bg;

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

@@ -242,11 +242,7 @@ a.ui-button:active,
 }
 
 /* Overlays */
-.ui-widget-overlay {
-  background: #aaa;
-  filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; /* support: IE8 */
-  opacity: 0.3;
-}
+/* Removed because it's screwing up CSS animation performance due to our CSS overrides of the property elsewhere */
 
 .ui-widget-shadow {
   -webkit-box-shadow: 0 0 5px #666#666;

package/package.json

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