From 6738a25bfa964acb97237af2adfb3aade7590e5e Mon Sep 17 00:00:00 2001
From: per ploug <pph@umbraco.dk>
Date: Thu, 4 Dec 2014 12:27:10 +0100
Subject: [PATCH] Fxes grid datatype config to handle cols > 12 and <= 0

---
 .../views/propertyeditors/grid/grid.prevalues.controller.js   | 3 +++
 .../src/views/propertyeditors/grid/grid.prevalues.html        | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
index e64d4ffe36..82b36697d8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
@@ -149,6 +149,9 @@ angular.module("umbraco")
             return ((spans / $scope.model.value.columns) * 100).toFixed(1);
         };
 
+        $scope.zeroWidthFilter = function (cell) {
+                return cell.grid > 0;
+        };
 
         /****************
             Config
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 1809e5b029..b7f46f0996 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -17,7 +17,7 @@
                         <div class="preview-row">
                             <div class="preview-col"
                                 ng-class="{last:$last}"
-                                ng-repeat="section in template.sections"
+                                ng-repeat="section in template.sections | filter:zeroWidthFilter"
                                 ng-style="{width: percentage(section.grid) + '%', height: '60px'}">
                                 <div class="preview-cell"></div>
                             </div>
@@ -63,7 +63,7 @@
                             <div class="preview-row">
                                 <div class="preview-col"
                                     ng-class="{last:$last}"
-                                    ng-repeat="area in layout.areas"
+                                    ng-repeat="area in layout.areas | filter:zeroWidthFilter"
                                     ng-style="{width: percentage(area.grid) + '%'}">
 
                                     <div class="preview-cell"></div>