Merge branch '7.2.1-configurablemacrogrideditor' of https://github.com/mattbrailsford/Umbraco-CMS into mattbrailsford-7.2.1-configurablemacrogrideditor

2015-03-19 14:33:36 +11:00
parent b9082cf390 9c8e6ab864
commit db5c204d8c
1 changed files with 4 additions and 1 deletions
--- 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 = {