Filter grid cell and row settings

per ploug · per ploug · commit d86a1946a7df · 2014-11-13T10:58:42.000+01:00
Settings and styles can now be specifically applied to a cell or a row,
by default on both
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
@@ -29,8 +29,9 @@ angular.module("umbraco")
         }
 
 
-        $scope.styles = angular.copy($scope.dialogOptions.config.items.styles);
-        $scope.config = angular.copy($scope.dialogOptions.config.items.config);
+        $scope.styles = _.filter( angular.copy($scope.dialogOptions.config.items.styles), function(item){return (item.applyTo === undefined || item.applyTo === $scope.dialogOptions.itemType); });
+        $scope.config = _.filter( angular.copy($scope.dialogOptions.config.items.config), function(item){return (item.applyTo === undefined || item.applyTo === $scope.dialogOptions.itemType); });
+
 
         var element = $scope.dialogOptions.gridItem;
         if(angular.isObject(element.config)){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -40,7 +40,6 @@ angular.module("umbraco")
                     tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
                 });
             }
-
         };
 
         var notIncludedRte = [];
@@ -235,13 +234,14 @@ angular.module("umbraco")
             }
         };
 
-        $scope.editGridItemSettings = function (gridItem) {
+        $scope.editGridItemSettings = function (gridItem, itemType) {
 
             dialogService.open(
                 {
                     template: "views/propertyeditors/grid/dialogs/config.html",
                     gridItem: gridItem,
                     config: $scope.model.config,
+                    itemType: itemType,
                     callback: function(data){
 
                         gridItem.styles = data.styles;
@@ -338,7 +338,8 @@ angular.module("umbraco")
 
             var newControl = {
                 value: null,
-                editor: editor
+                editor: editor,
+                $initializing: true
             };
 
             if (index === undefined) {
@@ -410,6 +411,8 @@ angular.module("umbraco")
                         $scope.model.value.sections.splice(index, 1);
                     }
                 });
+            }else if($scope.model.config.items.templates && $scope.model.config.items.templates.length === 1){
+                $scope.addTemplate($scope.model.config.items.templates[0]);
             }
 
             if(clear){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -88,7 +88,7 @@
                                     <a class="iconBox"
                                        ng-mouseover="setInfohighlightRow(row)"
                                        ng-mouseleave="disableInfohighlightRow(row)"
-                                       ng-click="editGridItemSettings(row)"
+                                       ng-click="editGridItemSettings(row, 'row')"
                                        href>
                                         <i class="icon icon-settings"></i>
                                     </a>
@@ -154,7 +154,7 @@
                                                             <a class="iconBox"
                                                                ng-mouseover="setInfohighlightArea(area)"
                                                                ng-mouseleave="disableInfohighlightArea(area)"
-                                                               ng-click="editGridItemSettings(area)"
+                                                               ng-click="editGridItemSettings(area, 'cell')"
                                                                href>
                                                                 <i class="icon icon-settings"></i>
                                                             </a>

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,9 @@ angular.module("umbraco")`
`29`	`29`	`}`
`30`	`30`
`31`	`31`
`32`		`- $scope.styles = angular.copy($scope.dialogOptions.config.items.styles);`
`33`		`- $scope.config = angular.copy($scope.dialogOptions.config.items.config);`
	`32`	`+ $scope.styles = _.filter( angular.copy($scope.dialogOptions.config.items.styles), function(item){return (item.applyTo === undefined \|\| item.applyTo === $scope.dialogOptions.itemType); });`
	`33`	`+ $scope.config = _.filter( angular.copy($scope.dialogOptions.config.items.config), function(item){return (item.applyTo === undefined \|\| item.applyTo === $scope.dialogOptions.itemType); });`
	`34`	`+`
`34`	`35`
`35`	`36`	`var element = $scope.dialogOptions.gridItem;`
`36`	`37`	`if(angular.isObject(element.config)){`