frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.18

This commit is contained in:
Nick O'Leary 2018-01-11 21:20:51 +00:00
parent 63f7d826bc 915d73e6f2
commit 9ba011003a
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/ui/editor.js
View File

@ -978,6 +978,8 @@ RED.editor = (function() {
if (outputsChanged) {
changed = true;
}
} else {
newValue = parseInt(newValue);
}
}
if (editing_node[d] != newValue) {

3
nodes/core/core/80-function.html
View File

@ -70,6 +70,9 @@
label: function() {
return this.name;
},
labelStyle: function() {
return this.name?"node_label_italic":"";
},
oneditprepare: function() {
var that = this;
$( "#node-input-outputs" ).spinner({

3
nodes/core/core/80-template.html
View File

@ -101,6 +101,9 @@
label: function() {
return this.name;
},
labelStyle: function() {
return this.name?"node_label_italic":"";
},
oneditprepare: function() {
var that = this;
if (!this.fieldType) {

2
nodes/core/io/21-httprequest.js
View File

@ -135,7 +135,7 @@ module.exports = function(RED) {
}
var payload = null;
if (typeof msg.payload !== "undefined" && (method == "POST" || method == "PUT" || method == "PATCH" ) ) {
if (typeof msg.payload !== "undefined") {
if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
payload = msg.payload;
} else if (typeof msg.payload == "number") {

3
nodes/core/logic/10-switch.html
View File

@ -114,6 +114,9 @@
label: function() {
return this.name||"switch";
},
labelStyle: function() {
return this.name?"node_label_italic":"";
},
oneditprepare: function() {
var node = this;
var previousValueType = {value:"prev",label:this._("inject.previous"),hasValue:false};