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

Merge

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-01-03 13:57:48 -01:00
parent 7bebb78bfc 22c7f0d6cc
commit ef43dec675
1 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/Umbraco.Web.UI/umbraco_client/Dialogs/EditMacro.js
View File

@@ -22,10 +22,69 @@
document.getElementById("label" + macroAlias).innerHTML = "</b><i>updated with id: " + treePicker + "</i><b><br/>"; document.getElementById("label" + macroAlias).innerHTML = "</b><i>updated with id: " + treePicker + "</i><b><br/>";
}, },
_getMacroParameter: function (macroAliasKeyVal) {
/// <summary>Returns a string to insert a macro parameter into the code like: MyPropertyName = "MyValue" </summary>
var paramString = "";
var controlId = macroAliasKeyVal[0];
var propertyName = macroAliasKeyVal[1];
var control = jQuery("#" + controlId);
if (control == null || (!control.is('input') && !control.is('select') && !control.is('textarea'))) {
// hack for tree based macro parameter types
var picker = Umbraco.Controls.TreePicker.GetPickerById(controlId);
if (picker != undefined) {
paramString += propertyName + "=\"" + picker.GetValue() + "\" ";
}
}
else {
if (control.is(':checkbox')) {
if (control.is(':checked')) {
paramString += propertyName + "=\"1\" ";
}
else {
paramString += propertyName + "=\"0\" ";
}
}
else if (control[0].tagName.toLowerCase() == 'select') {
var tempValue = '';
control.find(':selected').each(function (i, selected) {
tempValue += jQuery(this).attr('value') + ', ';
});
/*
for (var j=0; j<document.forms[0][controlId].length;j++) {
if (document.forms[0][controlId][j].selected)
tempValue += document.forms[0][controlId][j].value + ', ';
}
*/
if (tempValue.length > 2) {
tempValue = tempValue.substring(0, tempValue.length - 2);
}
paramString += propertyName + "=\"" + tempValue + "\" ";
}
else {
paramString += propertyName + "=\"" + this._pseudoHtmlEncode(document.forms[0][controlId].value) + "\" ";
}
}
return paramString;
},
_getMacroSyntaxMvc: function() { _getMacroSyntaxMvc: function() {
/// <summary>Return the macro syntax to insert for MVC</summary> /// <summary>Return the macro syntax to insert for MVC</summary>
return "@Umbraco.RenderMacro(\"" + this._opts.macroAlias + "\")"; var macroString = "@Umbraco.RenderMacro(\"" + this._opts.macroAlias + "\", new {";
for (var i = 0; i < this._macroAliases.length; i++) {
macroString += this._getMacroParameter(this._macroAliases[i]);
if (i < this._macroAliases.length - 1) {
macroString += ", ";
}
}
macroString += "});";
return macroString;
}, },
_getMacroSyntaxWebForms: function () { _getMacroSyntaxWebForms: function () {
@@ -42,48 +101,7 @@
var macroString = '<' + macroElement + ' '; var macroString = '<' + macroElement + ' ';
for (var i = 0; i < this._macroAliases.length; i++) { for (var i = 0; i < this._macroAliases.length; i++) {
var controlId = this._macroAliases[i][0]; macroString += this._getMacroParameter(this._macroAliases[i]);
var propertyName = this._macroAliases[i][1];
var control = jQuery("#" + controlId);
if (control == null || (!control.is('input') && !control.is('select') && !control.is('textarea'))) {
// hack for tree based macro parameter types
var picker = Umbraco.Controls.TreePicker.GetPickerById(controlId);
if (picker != undefined) {
macroString += propertyName + "=\"" + picker.GetValue() + "\" ";
}
}
else {
if (control.is(':checkbox')) {
if (control.is(':checked')) {
macroString += propertyName + "=\"1\" ";
}
else {
macroString += propertyName + "=\"0\" ";
}
}
else if (control[0].tagName.toLowerCase() == 'select') {
var tempValue = '';
control.find(':selected').each(function (i, selected) {
tempValue += jQuery(this).attr('value') + ', ';
});
/*
for (var j=0; j<document.forms[0][controlId].length;j++) {
if (document.forms[0][controlId][j].selected)
tempValue += document.forms[0][controlId][j].value + ', ';
}
*/
if (tempValue.length > 2) {
tempValue = tempValue.substring(0, tempValue.length - 2);
}
macroString += propertyName + "=\"" + tempValue + "\" ";
}
else {
macroString += propertyName + "=\"" + this._pseudoHtmlEncode(document.forms[0][controlId].value) + "\" ";
}
}
} }
if (macroString.length > 1) if (macroString.length > 1)