diff --git a/build/litegraph.js b/build/litegraph.js index 598f8ff56..36fbdb91c 100644 --- a/build/litegraph.js +++ b/build/litegraph.js @@ -9453,7 +9453,7 @@ LGraphNode.prototype.executeAction = function(action) entries.push({ content: "" + - (info.descriptor ? info.descriptor : i) + + (info.label ? info.label : i) + "" + "" + value + @@ -10051,7 +10051,7 @@ LGraphNode.prototype.executeAction = function(action) var dialog = this.createDialog( "" + - (info.descriptor ? info.descriptor : property) + + (info.label ? info.label : property) + "" + input_html + "", @@ -10078,8 +10078,12 @@ LGraphNode.prototype.executeAction = function(action) input.addEventListener("blur", function(e) { this.focus(); }); + var v = node.properties[property] !== undefined ? node.properties[property] : ""; - v = JSON.stringify(v); + if (type !== 'string') { + v = JSON.stringify(v); + } + input.value = v; input.addEventListener("keydown", function(e) { if (e.keyCode != 13) { diff --git a/build/litegraph.min.js b/build/litegraph.min.js index 4bbbb9879..a0dadea7d 100644 --- a/build/litegraph.min.js +++ b/build/litegraph.min.js @@ -4048,7 +4048,7 @@ $jscomp.polyfill("Object.values", function(x) { a = m.getPropertyPrintableValue(a, n.values); } a = m.decodeHTML(a); - k.push({content:"" + (n.descriptor ? n.descriptor : p) + "" + a + "", value:p}); + k.push({content:"" + (n.label ? n.label : p) + "" + a + "", value:p}); } if (k.length) { return new f.ContextMenu(k, {event:d, callback:function(a, b, d, e) { @@ -4371,7 +4371,7 @@ $jscomp.polyfill("Object.values", function(x) { k += ""; } } - var h = this.createDialog("" + (c.descriptor ? c.descriptor : b) + "" + k + "", d); + var h = this.createDialog("" + (c.label ? c.label : b) + "" + k + "", d); if ("enum" != f && "combo" != f || !c.values) { if ("boolean" == f) { (l = h.querySelector("input")) && l.addEventListener("click", function(a) { @@ -4381,7 +4381,7 @@ $jscomp.polyfill("Object.values", function(x) { if (l = h.querySelector("input")) { l.addEventListener("blur", function(a) { this.focus(); - }), n = void 0 !== a.properties[b] ? a.properties[b] : "", n = JSON.stringify(n), l.value = n, l.addEventListener("keydown", function(a) { + }), n = void 0 !== a.properties[b] ? a.properties[b] : "", "string" !== f && (n = JSON.stringify(n)), l.value = n, l.addEventListener("keydown", function(a) { 13 == a.keyCode && (e(), a.preventDefault(), a.stopPropagation()); }); } diff --git a/src/litegraph.js b/src/litegraph.js index 951e8c7f1..4404dbc36 100755 --- a/src/litegraph.js +++ b/src/litegraph.js @@ -9453,7 +9453,7 @@ LGraphNode.prototype.executeAction = function(action) entries.push({ content: "" + - (info.descriptor ? info.descriptor : i) + + (info.label ? info.label : i) + "" + "" + value + @@ -10051,7 +10051,7 @@ LGraphNode.prototype.executeAction = function(action) var dialog = this.createDialog( "" + - (info.descriptor ? info.descriptor : property) + + (info.label ? info.label : property) + "" + input_html + "", @@ -10078,8 +10078,12 @@ LGraphNode.prototype.executeAction = function(action) input.addEventListener("blur", function(e) { this.focus(); }); + var v = node.properties[property] !== undefined ? node.properties[property] : ""; - v = JSON.stringify(v); + if (type !== 'string') { + v = JSON.stringify(v); + } + input.value = v; input.addEventListener("keydown", function(e) { if (e.keyCode != 13) {