Merge pull request #813 from TimGeyssens/dev-v7

Fixes U4-7249 Insert Macro split button, when selecting a macro that …

src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js

@@ -9,12 +9,12 @@
         _openMacroModal: function(alias) {
             
             var self = this;
-
+           
             UmbClientMgr.openAngularModalWindow({
                 template: "views/common/dialogs/insertmacro.html",
                 dialogData: {
                     renderingEngine: "WebForms",
-                    selectedAlias: alias
+                    macroData: { macroAlias: alias }
                 },
                 callback: function(data) {
                     UmbEditor.Insert(data.syntax, '', self._opts.editorClientId);

src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js

@@ -45,12 +45,12 @@
             /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>
             
             var self = this;
-
+           
             UmbClientMgr.openAngularModalWindow({
                 template: "views/common/dialogs/insertmacro.html",
                 dialogData: {
                     renderingEngine: "Mvc",
-                    selectedAlias: alias
+                    macroData: {macroAlias: alias}
                 },
                 callback: function (data) {
                     UmbEditor.Insert(data.syntax, '', self._opts.codeEditorElementId);