From 098e6780aaae3489223bbb82bec99b79475d9bcb Mon Sep 17 00:00:00 2001 From: Kristofer Date: Thu, 19 Apr 2018 08:49:10 +0200 Subject: [PATCH] Fixed bug with -1 type check --- build/litegraph.js | 5 ++++- build/litegraph.min.js | 2 ++ package-lock.json | 2 +- src/litegraph.js | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/litegraph.js b/build/litegraph.js index 12f4a8900..4783c2546 100644 --- a/build/litegraph.js +++ b/build/litegraph.js @@ -336,7 +336,10 @@ var LiteGraph = global.LiteGraph = { !type_b || //generic input type_a == type_b || //same type (is valid for triggers) type_a == LiteGraph.EVENT && type_b == LiteGraph.ACTION ) - return true; + return true; + + type_a = String(type_a) //* Enforce string type to handle toLowerCase call (-1 number not ok) + type_b = String(type_b) type_a = type_a.toLowerCase(); type_b = type_b.toLowerCase(); diff --git a/build/litegraph.min.js b/build/litegraph.min.js index af47c0558..67fa86d62 100755 --- a/build/litegraph.min.js +++ b/build/litegraph.min.js @@ -346,6 +346,8 @@ $jscomp.polyfill("Array.prototype.values", function(u) { if (!a || !b || a == b || a == e.EVENT && b == e.ACTION) { return !0; } + a = String(a); + b = String(b); a = a.toLowerCase(); b = b.toLowerCase(); if (-1 == a.indexOf(",") && -1 == b.indexOf(",")) { diff --git a/package-lock.json b/package-lock.json index 1c51947c3..48be7a1f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "litegraph.js", - "version": "0.4.0", + "version": "0.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/litegraph.js b/src/litegraph.js index c023cb2ad..d4c2c2123 100755 --- a/src/litegraph.js +++ b/src/litegraph.js @@ -336,7 +336,10 @@ var LiteGraph = global.LiteGraph = { !type_b || //generic input type_a == type_b || //same type (is valid for triggers) type_a == LiteGraph.EVENT && type_b == LiteGraph.ACTION ) - return true; + return true; + + type_a = String(type_a) //* Enforce string type to handle toLowerCase call (-1 number not ok) + type_b = String(type_b) type_a = type_a.toLowerCase(); type_b = type_b.toLowerCase();