Merge branch 'master' into 0.18

This commit is contained in:
Nick O'Leary
2018-01-11 21:20:51 +00:00
5 changed files with 12 additions and 1 deletions

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};