frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch '0.19' into typedInput-context

Browse Source
This commit is contained in:
Nick O'Leary 2018-07-04 13:37:05 +01:00
commit a5a79d3ab7
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/js/ui/common/typedInput.js
View File

@ -518,7 +518,9 @@
var opt = this.typeMap[type]; var opt = this.typeMap[type];
if (opt && this.propertyType !== type) { if (opt && this.propertyType !== type) {
this.propertyType = type; this.propertyType = type;
if (this.typeField) {
this.typeField.val(type); this.typeField.val(type);
}
this.selectLabel.empty(); this.selectLabel.empty();
var image; var image;
if (opt.icon) { if (opt.icon) {
@ -628,6 +630,7 @@
} }
this.elementDiv.show(); this.elementDiv.show();
} }
if (this.optionExpandButton) {
if (opt.expand && typeof opt.expand === 'function') { if (opt.expand && typeof opt.expand === 'function') {
this.optionExpandButton.show(); this.optionExpandButton.show();
this.optionExpandButton.off('click'); this.optionExpandButton.off('click');
@ -638,6 +641,7 @@
} else { } else {
this.optionExpandButton.hide(); this.optionExpandButton.hide();
} }
}
this.input.trigger('change',this.propertyType,this.value()); this.input.trigger('change',this.propertyType,this.value());
} }
if (image) { if (image) {