From 51e31b697d59ce2370d18eb0621f0977b5e4cf24 Mon Sep 17 00:00:00 2001
From: WombatFromHell <WombatFromHell@users.noreply.github.com>
Date: Tue, 16 Jul 2019 13:59:32 -0600
Subject: [PATCH] Fixed a regression in objContains logic

---
 common.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/common.js b/common.js
index 0590e2af..2b1e3a0f 100644
--- a/common.js
+++ b/common.js
@@ -62,18 +62,21 @@ function insertStyle(css, containerName)
 
 function objContains(needle, haystack)
 {// tests if an object (or nested object) contains a matching value (or prop)
+    // since objects can contains Arrays test for them too
     if (isEmpty(haystack)) return false;
-    else {
-        let hopCheck = Object.prototype.hasOwnProperty(haystack, needle);
-        if (hopCheck) return true; // quick top level check
-        for (let k of Object.keys(haystack)) {
-            if (haystack[k] instanceof Object)
-                objContains(needle, haystack[k]);
-            else if (haystack[k] === needle)
-                return true;
+    if (haystack === needle) return true;
+    for (let v of Object.values(haystack)) {
+        if (v instanceof Object) {
+            let _objResult = objContains(needle, v);
+            if (_objResult) return true;
+        } else if (Array.isArray(v)) {
+            let _arrResult = objContains(needle, {...v});
+            if (_arrResult) return true;
+        } else if (v === needle) {
+            return true;
         }
-        return false;
     }
+    return false;
 }
 
 function superTrim(string) {