From 9c8e6ab86491021bec7b64aa78e446b0ae7f411a Mon Sep 17 00:00:00 2001 From: mattbrailsford Date: Mon, 26 Jan 2015 12:35:01 +0000 Subject: [PATCH] Add "config" support to the macro grid property editor to allow predefining the macro to use --- .../views/propertyeditors/grid/editors/macro.controller.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js index e9eef022e7..ac5399cb75 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js @@ -8,7 +8,10 @@ angular.module("umbraco") dialogService.macroPicker({ dialogData: { richTextEditor: true, - macroData: $scope.control.value + macroData: $scope.control.value || { + macroAlias: $scope.control.editor.config && $scope.control.editor.config.macroAlias + ? $scope.control.editor.config.macroAlias : "" + } }, callback: function (data) { $scope.control.value = {