From 7eeb0c496652c33115cf1fcd4434810c63ebb66f Mon Sep 17 00:00:00 2001
From: TimGeyssens <tg@umbraco.com>
Date: Wed, 14 Oct 2015 11:29:34 +0200
Subject: [PATCH] Fixes U4-7249 Insert Macro split button, when selecting a
 macro that has parameters the dialog should immediately show those

---
 src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js | 4 ++--
 src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js
index d9b1a28505..b8c1a203d6 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js
+++ b/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);
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
index 28398d081a..16a0635b70 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
@@ -41,12 +41,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);