';
var messages = document.createElement("div");
messages.id = "debug-content";
diff --git a/nodes/core/core/90-comment.html b/nodes/core/core/90-comment.html
index 7e0aeb8ea..8469eecb5 100644
--- a/nodes/core/core/90-comment.html
+++ b/nodes/core/core/90-comment.html
@@ -51,9 +51,7 @@
return this.name?"node_label_italic":"";
},
info: function() {
- var t = this.name || this._("comment.defaulttitle");
- var b = this.info || this._("comment.defaultinfo");
- return "### "+t+"\n"+b;
+ return (this.name?"# "+this.name+"\n":"")+(this.info||"");
},
oneditprepare: function() {
var that = this;
diff --git a/nodes/core/io/21-httpin.html b/nodes/core/io/21-httpin.html
index 6380bae30..b308ac81e 100644
--- a/nodes/core/io/21-httpin.html
+++ b/nodes/core/io/21-httpin.html
@@ -33,7 +33,7 @@
-
+
.
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index d50a2b029..9777080c8 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -172,9 +172,7 @@
"title": "Title",
"body": "Body"
},
- "tip": "Tip: The text can be styled as Github flavoured Markdown",
- "defaulttitle": "Comment node",
- "defaultinfo": "Use this node to add simple documentation.\n\nAnything you add will be rendered in this info panel.\n\nYou may use Markdown syntax to **enhance** the *presentation*."
+ "tip": "Tip: The text can be styled as Github flavoured Markdown"
},
"unknown": {
"label": {
diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html
index c8f5f8c03..2aad67b03 100644
--- a/nodes/core/logic/10-switch.html
+++ b/nodes/core/logic/10-switch.html
@@ -28,7 +28,7 @@
-
+
-
+
@@ -101,12 +101,12 @@
var regex = this._("change.label.regex");
if (this.reg === null) { $("#node-input-reg").prop('checked', true); }
$("#node-input-action").change();
-
+
function generateRule(rule) {
var container = $('',{style:"background: #fff; margin:0; padding:8px 0px; border-bottom: 1px solid #ccc;"});
-
+
var row1 = $('').appendTo(container);
-
+
var row2 = $('',{style:"margin-top:8px;"}).appendTo(container);
var row3 = $('',{style:"margin-top:8px;"}).appendTo(container);
@@ -115,36 +115,36 @@
for (var i=0;i<3;i++) {
selectField.append($("").val(selectOptions[i].v).text(selectOptions[i].l));
}
-
+
$('',{style:"display:inline-block; width: 50px; text-align: right;"}).text("msg.").appendTo(row1);
var propertyName = $('',{style:"width: 220px",class:"node-input-rule-property-name",type:"text"}).appendTo(row1);
-
- var finalspan = $('',{style:"float: right; margin-top: 3px;margin-right: 10px;"}).appendTo(row1);
- var deleteButton = $('',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan);
+
+ var finalspan = $('',{style:"float: right; margin-right: 10px;"}).appendTo(row1);
+ var deleteButton = $('',{href:"#",class:"editor-button", style:"margin-left: 5px;"}).appendTo(finalspan);
$('',{class:"fa fa-remove"}).appendTo(deleteButton);
-
+
$('',{style:"display: inline-block;text-align:right; width:150px;padding-right: 10px; box-sizing: border-box;"}).text(to).appendTo(row2);
var propertyValue = $('',{style:"width: 220px",class:"node-input-rule-property-value",type:"text"}).appendTo(row2);
-
+
var row3_1 = $('').appendTo(row3);
$('',{style:"display: inline-block;text-align:right; width:150px;padding-right: 10px; box-sizing: border-box;"}).text(search).appendTo(row3_1);
var fromValue = $('',{style:"width: 220px",class:"node-input-rule-property-search-value",type:"text"}).appendTo(row3_1);
-
+
var row3_2 = $('',{style:"margin-top:8px;"}).appendTo(row3);
$('',{style:"display: inline-block;text-align:right; width:150px;padding-right: 10px; box-sizing: border-box;"}).text(replace).appendTo(row3_2);
var toValue = $('',{style:"width: 220px",class:"node-input-rule-property-replace-value",type:"text"}).appendTo(row3_2);
-
+
var row3_3 = $('',{style:"margin-top:8px;"}).appendTo(row3);
var id = "node-input-rule-property-regex-"+Math.floor(Math.random()*10000);
var useRegExp = $('',{id:id,class:"node-input-rule-property-re",type:"checkbox", style:"margin-left: 150px; margin-right: 10px; display: inline-block; width: auto; vertical-align: top;"}).appendTo(row3_3);
$('',{for:id,style:"width: auto;"}).text(regex).appendTo(row3_3);
-
+
selectField.change(function() {
var type = $(this).val();
-
+
if (type == "set") {
row2.show();
row3.hide();
@@ -162,7 +162,7 @@
$(this).remove();
});
});
-
+
selectField.find("option").filter(function() {return $(this).val() == rule.t;}).attr('selected',true);
propertyName.val(rule.p);
propertyValue.val(rule.to);
@@ -170,19 +170,19 @@
toValue.val(rule.to);
useRegExp.prop('checked', rule.re);
selectField.change();
-
+
$("#node-input-rule-container").append(container);
}
$("#node-input-add-rule").click(function() {
generateRule({t:"replace",p:"payload"});
});
-
+
if (!this.rules) {
var rule = {
t:(this.action=="replace"?"set":this.action),
p:this.property
}
-
+
if (rule.t === "set") {
rule.to = this.to;
} else if (rule.t === "change") {
@@ -190,20 +190,20 @@
rule.to = this.to;
rule.re = this.reg;
}
-
+
delete this.to;
delete this.from;
delete this.reg;
delete this.action;
delete this.property;
-
+
this.rules = [rule];
}
-
+
for (var i=0;idiv:not(.node-input-rule-container-row)");
var height = $("#dialog-form").height();