Merge branch 'release/3.6.0'

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## Unreleased
 
+
+## 3.6.0 - 2020-09-25
+
+### Changed
+- Spoon is now compatible with Craft 3.5, as a result of these changes Spoon requires Craft 3.5 or greater from this release onward.
+
+
 ## 3.5.3 - 2020-07-30
 
 ### Fixed

composer.json

@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.4.0"
+        "craftcms/cms": "^3.5.0"
     },
     "autoload": {
         "psr-4": {

src/assetbundles/ConfiguratorAsset.php

@@ -43,7 +43,6 @@ public function init()
         // define the relative path to CSS/JS files that should be registered with the page
         // when this asset bundle is registered
         $this->js = [
-            'js/BlockTypeFieldLayoutDesigner.min.js',
             'js/GroupsDesigner.min.js',
             'js/Configurator.min.js'
         ];

src/assetbundles/FieldManipulatorAsset.php

@@ -42,8 +42,21 @@ public function init()
             MatrixAsset::class
         ];
 
-        // define the relative path to CSS/JS files that should be registered with the page
-        // when this asset bundle is registered
+
+        // TODO: hook up entire stack of flds to js window state so we can swap in the UI rendered version of the raw
+        //       html around line 384 of FieldManipulator.js
+//        $blockTypes = Spoon::$plugin->blockTypes->getByContext('global');
+//
+//        foreach ($blockTypes as $blockType) {
+//
+//            if ($blockType->fieldLayoutId) {
+//                foreach ($blockType->getFieldLayout()->getTabs() as $tab) {
+//                    Craft::dd($tab->elements);
+//                }
+//            }
+//        }
+
+
         $this->js = [
             'js/FieldManipulator.min.js',
         ];