@concretecms/bedrock 1.6.7 → 1.7.0

package/assets/ckeditor/js/concrete/file-manager.js

@@ -15,6 +15,9 @@
                             jQuery.fn.dialog.showLoader()
                             ConcreteFileManager.getFileDetails(data.fID, function (r) {
                                 jQuery.fn.dialog.hideLoader()
+                                if (!r) {
+                                    return
+                                }
                                 var file = r.files[0]
                                 if ((dialog.getName() == 'image' || dialog.getName() == 'image2') && dialog._.currentTabId == 'info') {
                                     CKEDITOR.tools.callFunction(editor._.filebrowserFn, file.urlInline, function () {

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

@@ -121,10 +121,10 @@ export default {
             var my = this
             my.isLoading = true
             ConcreteFileManager.getFileDetails(fileId, function (r) {
-                my.selectedFile = r.files[0]
-                my.selectedFileID = fileId
+                my.selectedFile = r ? r.files[0] : null
+                my.selectedFileID = r ? fileId : 0
                 my.isLoading = false
-                my.$emit('selectedfile', r.files[0])
+                my.$emit('selectedfile', my.selectedFile)
             })
         }
 

package/assets/cms/components/gallery/GalleryEdit.vue

@@ -183,7 +183,7 @@ export default {
             ConcreteFileManager.launchDialog(function(data) {
                 for (var fID of data.fID) {
                     ConcreteFileManager.getFileDetails(fID, function (file) {
-                        file = file.files[0] || {}
+                        file = file?.files[0] || {}
                         me.gallery.push({
                             id: file.fID,
                             title: file.title,

package/assets/cms/components/groups/Chooser.vue

@@ -142,7 +142,10 @@ export default {
         },
         triggerSelect(gID, gName, gDisplayName) {
             gID = parseInt(gID) || 0
-            ConcreteEvent.publish('SelectGroup', { gID, gName, gDisplayName })
+            // Fallback to legacy event if no Vue listener is defined
+            if (!this.$listeners.select) {
+                ConcreteEvent.publish('SelectGroup', { gID, gName, gDisplayName })
+            }
             this.$emit('select', { gID, gName, gDisplayName })
         },
         performSearch(event) {

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

@@ -210,7 +210,7 @@
                     }
                     $.fn.dialog.hideLoader()
                     _.defer(function () {
-                        my.getEditMode().scanBlocks()
+                        Concrete.getEditMode().scanBlocks()
                         my.showSuccessfulAdd()
                         Concrete.forceRefresh()
 

package/assets/cms/js/file-manager/file-manager.js

@@ -51,6 +51,7 @@ class ConcreteFileManager {
             data: { fID: fID },
             error: function(r) {
                 ConcreteAlert.dialog(ccmi18n.error, r.responseText)
+                callback(null)
             },
             success: function(r) {
                 callback(r)

package/assets/stacks/js/backend.js

@@ -0,0 +1,2 @@
+// Components
+import './backend/stack-editor'

package/assets/stacks/scss/backend/_backend.scss

@@ -0,0 +1,2 @@
+@import 'stack-editor';
+

package/assets/stacks/scss/backend/_stack-editor.scss

@@ -0,0 +1,21 @@
+@import '../../../cms/scss/variables';
+
+#ccm-stack-editor {
+  margin-top: 100px;
+
+  .ccm-dashboard-breadcrumb {
+    font-size: 1rem;
+    margin-bottom: 0;
+    margin-top: 0;
+    padding-bottom: 0;
+    padding-top: 0;
+
+    a.dropdown-toggle {
+      color: $gray-600;
+    }
+  }
+
+  .ccm-stack-editor-column {
+    transition: width 0.1s cubic-bezier(0.19, 1, 0.22, 1);
+  }
+}

package/assets/stacks/scss/backend.scss

@@ -0,0 +1,4 @@
+// This is an entry point so it just includes the partial that includes everything else.
+// That way if we want to include full support in our theme we just include the partial (rather
+// than including the entry point because I think it's bad practice.)
+@import 'backend/backend';

package/package.json

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