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

Still parse/export typedInput values even when no options set

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

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

@ -132,8 +132,8 @@
return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'} return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database" style="color: #'+(store==='memory'?'ddd':'777')+'"></i>'}
}) })
if (contextOptions.length < 2) { if (contextOptions.length < 2) {
delete allOptions.flow.options; allOptions.flow.options = [];
delete allOptions.global.options allOptions.global.options = [];
} else { } else {
allOptions.flow.options = contextOptions; allOptions.flow.options = contextOptions;
allOptions.global.options = contextOptions; allOptions.global.options = contextOptions;
@ -592,22 +592,31 @@
var parts = opt.parse(this.input.val()); var parts = opt.parse(this.input.val());
if (parts.option) { if (parts.option) {
selectedOption = parts.option; selectedOption = parts.option;
if (!this.activeOptions.hasOwnProperty(selectedOption)) {
parts.option = Object.keys(this.activeOptions)[0];
selectedOption = parts.option
}
} }
this.input.val(parts.value); this.input.val(parts.value);
if (opt.export) { if (opt.export) {
this.element.val(opt.export(parts.value,parts.option||selectedOption)); this.element.val(opt.export(parts.value,parts.option||selectedOption));
} }
} }
if (typeof selectedOption === "string") { if (typeof selectedOption === "string") {
this.optionValue = selectedOption; this.optionValue = selectedOption;
if (!this.activeOptions.hasOwnProperty(selectedOption)) { if (!this.activeOptions.hasOwnProperty(selectedOption)) {
selectedOption = Object.keys(this.activeOptions)[0]; selectedOption = Object.keys(this.activeOptions)[0];
} }
this._updateOptionSelectLabel(this.activeOptions[selectedOption]); if (!selectedOption) {
} else { this.optionSelectTrigger.hide();
} else {
this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
}
} else if (selectedOption) {
this.optionValue = selectedOption.value; this.optionValue = selectedOption.value;
this._updateOptionSelectLabel(selectedOption); this._updateOptionSelectLabel(selectedOption);
} else {
this.optionSelectTrigger.hide();
} }
} }
} }