From 3c6bb87083c4b04a40dd97510afba6233dbb8dee Mon Sep 17 00:00:00 2001 From: Mel Massadian Date: Mon, 23 Dec 2024 18:24:54 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20simplify=20set/get=20?= =?UTF-8?q?alerts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now use the builtin toast api --- web/js/setgetnodes.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/web/js/setgetnodes.js b/web/js/setgetnodes.js index bb2b19d..02618a8 100644 --- a/web/js/setgetnodes.js +++ b/web/js/setgetnodes.js @@ -28,16 +28,17 @@ function setColorAndBgColor(type) { this.bgcolor = colors.bgcolor; } } -let isAlertShown = false; let disablePrefix = app.ui.settings.getSettingValue("KJNodes.disablePrefix") const LGraphNode = LiteGraph.LGraphNode -function showAlertWithThrottle(message, delay) { - if (!isAlertShown) { - isAlertShown = true; - alert(message); - setTimeout(() => isAlertShown = false, delay); - } +function showAlert(message) { + message = message || "Set node input undefined." + app.extensionManager.toast.add({ + severity: 'warn', + summary: "KJ Get/Set", + detail: `${message}. Most likely you're missing custom nodes`, + life: 5000, + }) } app.registerExtension({ name: "SetNode", @@ -122,7 +123,7 @@ app.registerExtension({ setColorAndBgColor.call(this, type); } } else { - alert("Error: Set node input undefined. Most likely you're missing custom nodes"); + showAlert("missing link info") } } if (link_info && node.graph && slotType == 2 && isChangeConnect) { @@ -134,7 +135,7 @@ app.registerExtension({ this.outputs[0].type = type; this.outputs[0].name = type; } else { - alert("Error: Get Set node output undefined. Most likely you're missing custom nodes"); + showAlert('node output undefined'); } } @@ -485,7 +486,7 @@ app.registerExtension({ return link; } else { const errorMessage = "No SetNode found for " + this.widgets[0].value + "(" + this.type + ")"; - showAlertWithThrottle(errorMessage, 5000); + showAlert(errorMessage); //throw new Error(errorMessage); } } From f38b89ba7f2f063a7fe679170782e964793ea438 Mon Sep 17 00:00:00 2001 From: Mel Massadian Date: Mon, 23 Dec 2024 18:29:20 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/js/setgetnodes.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/js/setgetnodes.js b/web/js/setgetnodes.js index 02618a8..4df4749 100644 --- a/web/js/setgetnodes.js +++ b/web/js/setgetnodes.js @@ -32,7 +32,6 @@ let disablePrefix = app.ui.settings.getSettingValue("KJNodes.disablePrefix") const LGraphNode = LiteGraph.LGraphNode function showAlert(message) { - message = message || "Set node input undefined." app.extensionManager.toast.add({ severity: 'warn', summary: "KJ Get/Set", @@ -123,7 +122,7 @@ app.registerExtension({ setColorAndBgColor.call(this, type); } } else { - showAlert("missing link info") + showAlert("node input undefined.") } } if (link_info && node.graph && slotType == 2 && isChangeConnect) {