Merge pull request umbraco#612 from gildebrand/patch-3

Shazwazza · Shazwazza · commit 69e1dd1c73b5 · 2015-01-06T11:50:31.000+11:00
Fix for macrocontainer making it possible to edit
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/macrocontainer/macrocontainer.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/macrocontainer/macrocontainer.controller.js
@@ -41,7 +41,7 @@ angular.module('umbraco')
 
 			if(index !== null && $scope.renderModel[index]) {
 				var macro = $scope.renderModel[index];
-				dialogData[macroData] = macro;
+				dialogData["macroData"] = macro;
 			}
 			
 			dialogService.macroPicker({
@@ -100,4 +100,4 @@ angular.module('umbraco')
 			return str.replace(rgxtrim, '');
 		}
 
-});
+});

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ angular.module('umbraco')`
`41`	`41`
`42`	`42`	`if(index !== null && $scope.renderModel[index]) {`
`43`	`43`	`var macro = $scope.renderModel[index];`
`44`		`- dialogData[macroData] = macro;`
	`44`	`+ dialogData["macroData"] = macro;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`dialogService.macroPicker({`
`@@ -100,4 +100,4 @@ angular.module('umbraco')`
`100`	`100`	`return str.replace(rgxtrim, '');`
`101`	`101`	`}`
`102`	`102`
`103`		`-});`
	`103`	`+});`