From 66a7a5cf784c8a1c9eb42b37d4396c5dc8952437 Mon Sep 17 00:00:00 2001
From: RobTheFiveNine <49003204+RobTheFiveNine@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:02:31 +0100
Subject: [PATCH 1/2] Fix serialisation bug when editing string properties
---
build/litegraph.js | 6 +++++-
build/litegraph.min.js | 2 +-
src/litegraph.js | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/build/litegraph.js b/build/litegraph.js
index 598f8ff56..765b36964 100644
--- a/build/litegraph.js
+++ b/build/litegraph.js
@@ -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..b3675243a 100644
--- a/build/litegraph.min.js
+++ b/build/litegraph.min.js
@@ -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..5fdf90aff 100755
--- a/src/litegraph.js
+++ b/src/litegraph.js
@@ -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) {
From 88994e1843afb5d56af67bd95bef9e8083b36276 Mon Sep 17 00:00:00 2001
From: RobTheFiveNine <49003204+RobTheFiveNine@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:08:02 +0100
Subject: [PATCH 2/2] Change terminology for property descriptors to 'labels'
---
build/litegraph.js | 4 ++--
build/litegraph.min.js | 4 ++--
src/litegraph.js | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build/litegraph.js b/build/litegraph.js
index 765b36964..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 +
"",
diff --git a/build/litegraph.min.js b/build/litegraph.min.js
index b3675243a..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) {
diff --git a/src/litegraph.js b/src/litegraph.js
index 5fdf90aff..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 +
"",