yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes U4-4531 dialogService.macroPicker callback wrong property name

Browse Source
This commit is contained in:
Shannon
2014-03-27 16:43:20 +11:00
parent cc0bcc2d59
commit 43f647fd94
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
View File

@@ -28,10 +28,10 @@ function macroService() {
var paramMatch;
var returnVal = {
macroAlias: alias,
marcoParamsDictionary: {}
macroParamsDictionary: {}
};
while (paramMatch = paramExpression.exec(paramsChunk)) {
returnVal.marcoParamsDictionary[paramMatch[1]] = paramMatch[2];
returnVal.macroParamsDictionary[paramMatch[1]] = paramMatch[2];
}
return returnVal;
},
@@ -53,9 +53,9 @@ function macroService() {
var macroString = '<?UMBRACO_MACRO macroAlias=\"' + args.macroAlias + "\" ";
if (args.marcoParamsDictionary) {
if (args.macroParamsDictionary) {
_.each(args.marcoParamsDictionary, function (val, key) {
_.each(args.macroParamsDictionary, function (val, key) {
//check for null
val = val ? val : "";
//need to detect if the val is a string or an object
@@ -96,9 +96,9 @@ function macroService() {
var macroString = '<umbraco:Macro ';
if (args.marcoParamsDictionary) {
if (args.macroParamsDictionary) {
_.each(args.marcoParamsDictionary, function (val, key) {
_.each(args.macroParamsDictionary, function (val, key) {
var keyVal = key + "=\"" + (val ? val : "") + "\" ";
macroString += keyVal;
});
@@ -127,11 +127,11 @@ function macroService() {
var hasParams = false;
var paramString;
if (args.marcoParamsDictionary) {
if (args.macroParamsDictionary) {
paramString = ", new {";
_.each(args.marcoParamsDictionary, function(val, key) {
_.each(args.macroParamsDictionary, function(val, key) {
hasParams = true;

2
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -250,7 +250,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
//need to wrap in safe apply since this might be occuring outside of angular
angularHelper.safeApply($scope, function() {
macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.marcoParamsDictionary)
macroResource.getMacroResultAsHtmlForEditor(macroData.macroAlias, contentId, macroData.macroParamsDictionary)
.then(function (htmlResult) {
$macroDiv.removeClass("loading");

12
src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
View File

@@ -25,8 +25,8 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
$scope.macroParams = data;
//fill in the data if we are editing this macro
if ($scope.dialogData && $scope.dialogData.macroData && $scope.dialogData.macroData.marcoParamsDictionary) {
_.each($scope.dialogData.macroData.marcoParamsDictionary, function (val, key) {
if ($scope.dialogData && $scope.dialogData.macroData && $scope.dialogData.macroData.macroParamsDictionary) {
_.each($scope.dialogData.macroData.macroParamsDictionary, function (val, key) {
var prop = _.find($scope.macroParams, function (item) {
return item.alias == key;
});
@@ -58,16 +58,16 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
//get the syntax based on the rendering engine
var syntax;
if ($scope.dialogData.renderingEngine && $scope.dialogData.renderingEngine === "WebForms") {
syntax = macroService.generateWebFormsSyntax({ macroAlias: macroAlias, marcoParamsDictionary: paramDictionary });
syntax = macroService.generateWebFormsSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
}
else if ($scope.dialogData.renderingEngine && $scope.dialogData.renderingEngine === "Mvc") {
syntax = macroService.generateMvcSyntax({ macroAlias: macroAlias, marcoParamsDictionary: paramDictionary });
syntax = macroService.generateMvcSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
}
else {
syntax = macroService.generateMacroSyntax({ macroAlias: macroAlias, marcoParamsDictionary: paramDictionary });
syntax = macroService.generateMacroSyntax({ macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
}
$scope.submit({ syntax: syntax, macroAlias: macroAlias, marcoParamsDictionary: paramDictionary });
$scope.submit({ syntax: syntax, macroAlias: macroAlias, macroParamsDictionary: paramDictionary });
}
$scope.macros = [];

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/macrocontainer/macrocontainer.controller.js
View File

@@ -27,8 +27,8 @@ angular.module('umbraco')
function collectDetails(macro){
macro.details = "";
if(macro.marcoParamsDictionary){
angular.forEach((macro.marcoParamsDictionary), function(value, key){
if(macro.macroParamsDictionary){
angular.forEach((macro.macroParamsDictionary), function(value, key){
macro.details += key + ": " + value + " ";
});
}