Fixed logic to check block limits so it doesn't affect top level sect…

…ions (fixes #766)
gantry · Aug 31, 2015 · 9587388 · 9587388
1 parent e503457
commit 9587388
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
         - Fix regression in all collections (#761, #762, #764, #767, #768)
         - Fix Argument 1 passed to RocketTheme\Toolbox\Blueprints\Blueprints::mergeArrays() must be of the type array
         - Re-index collection lists to avoid gaps in the indexing (also fixes broken lists that were saved)
+        - Fixed issue in Layout Manager where top level section settings would show the Block tab (#766)
 3. [WordPress)(#wordpress)
     3. [](#bugfix)
         - Fixed issue when renaming an Outline that prevented it to further get edited, duplicated or deleted (#588)

diff --git a/platforms/common/application/lm/index.js b/platforms/common/application/lm/index.js
@@ -428,7 +428,7 @@ ready(function() {
             data.title = (element.find('h4') || element.find('.title')).text() || data.type || 'Untitled';
             data.options = builder.get(element.data('lm-id')).getAttributes() || {};
             data.block = parent ? builder.get(parent.data('lm-id')).getAttributes() || {} : {};
-            data.block.size_limits = builder.get(element.data('lm-id')).getLimits(!parent ? false : builder.get(parent.data('lm-id')));
+            data.size_limits = builder.get(element.data('lm-id')).getLimits(!parent ? false : builder.get(parent.data('lm-id')));
 
             if (!data.type) { delete data.type; }
             if (!data.subtype) { delete data.subtype; }
@@ -456,10 +456,10 @@ ready(function() {
                 var blockSize = content.elements.content.find('[name="block[size]"]');
 
                 // logic for limits
-                if (blockSize && data.block.size_limits) {
+                if (blockSize && data.size_limits) {
                     var note = content.elements.content.find('.blocksize-note'),
-                        min = data.block.size_limits[0],
-                        max = data.block.size_limits[1];
+                        min = data.size_limits[0],
+                        max = data.size_limits[1];
 
                     blockSize.attribute('min', min);
                     blockSize.attribute('max', max);

diff --git a/platforms/common/js/main.js b/platforms/common/js/main.js
@@ -2510,7 +2510,7 @@ ready(function() {
             data.title = (element.find('h4') || element.find('.title')).text() || data.type || 'Untitled';
             data.options = builder.get(element.data('lm-id')).getAttributes() || {};
             data.block = parent ? builder.get(parent.data('lm-id')).getAttributes() || {} : {};
-            data.block.size_limits = builder.get(element.data('lm-id')).getLimits(!parent ? false : builder.get(parent.data('lm-id')));
+            data.size_limits = builder.get(element.data('lm-id')).getLimits(!parent ? false : builder.get(parent.data('lm-id')));
 
             if (!data.type) { delete data.type; }
             if (!data.subtype) { delete data.subtype; }
@@ -2538,10 +2538,10 @@ ready(function() {
                 var blockSize = content.elements.content.find('[name="block[size]"]');
 
                 // logic for limits
-                if (blockSize && data.block.size_limits) {
+                if (blockSize && data.size_limits) {
                     var note = content.elements.content.find('.blocksize-note'),
-                        min = data.block.size_limits[0],
-                        max = data.block.size_limits[1];
+                        min = data.size_limits[0],
+                        max = data.size_limits[1];
 
                     blockSize.attribute('min', min);
                     blockSize.attribute('max', max);