yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes grid editor always rending 12 columns

Browse Source 
When a user change grid cols, the editor keeps rendering 12 column
layouts - this fixes the 12 cols issue and falls back to 12 in case of
invalid/missing information
This commit is contained in:
per ploug
2014-12-19 16:11:33 +01:00
parent 72004768cf
commit 2e2ea57ba6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -389,7 +389,7 @@ angular.module("umbraco")
};
$scope.percentage = function(spans){
return ((spans/12)*100).toFixed(1);
return (( spans/ $scope.model.config.items.columns ) *100).toFixed(1);
};
@@ -399,6 +399,7 @@ angular.module("umbraco")
// *********************************************
// INITIALISATION
// these methods are called from ng-init on the template
@@ -419,6 +420,13 @@ angular.module("umbraco")
$scope.hasSettings = true;
}
//ensure the grid has a column value set, if nothing is found, set it to 12
if($scope.model.config.items.columns && angular.isString($scope.model.config.items.columns)){
$scope.model.config.items.columns = parseInt($scope.model.config.items.columns);
}else{
$scope.model.config.items.columns = 12;
}
if ($scope.model.value && $scope.model.value.sections && $scope.model.value.sections.length > 0) {
_.forEach($scope.model.value.sections, function(section, index){