From a3ad8e2caba2f57c2eb8efb546f6fa26bf1b11d1 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 11 Sep 2014 08:23:22 +0200 Subject: [PATCH] Die, Marco, die. --- .../views/propertyeditors/grid/editors/macro.controller.js | 2 +- src/Umbraco.Web.UI/Views/Partials/Grid/Editors/macro.cshtml | 2 +- src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 571fde1aa3..b30af21cc2 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 @@ -10,7 +10,7 @@ angular.module("umbraco") $scope.control.value = { syntax: data.syntax, macroAlias: data.macroAlias, - marcoParamsDictionary: data.macroParamsDictionary + macroParamsDictionary: data.macroParamsDictionary }; $scope.setPreview(data); diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/macro.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/macro.cshtml index 60db09cc3a..94ae154c87 100644 --- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/macro.cshtml +++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/macro.cshtml @@ -6,7 +6,7 @@ { string macroAlias = Model.value.macroAlias.ToString(); ViewDataDictionary parameters = new ViewDataDictionary(); - foreach (dynamic mpd in Model.value.marcoParamsDictionary) + foreach (dynamic mpd in Model.value.macroParamsDictionary) { parameters.Add(mpd.Name, mpd.Value); } diff --git a/src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs b/src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs index 0c35e9d6ef..71c3462bf8 100644 --- a/src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs +++ b/src/Umbraco.Web/Models/PartialViewMacroModelExtensions.cs @@ -8,7 +8,7 @@ namespace Umbraco.Web.Models public static class PartialViewMacroModelExtensions { /// - /// Attempt to get a Marco parameter from a PartialViewMacroModel and return a default value otherwise + /// Attempt to get a Macro parameter from a PartialViewMacroModel and return a default value otherwise /// /// /// @@ -25,7 +25,7 @@ namespace Umbraco.Web.Models } /// - /// Attempt to get a Marco parameter from a PartialViewMacroModel + /// Attempt to get a Macro parameter from a PartialViewMacroModel /// /// ///