From 10ec165f14e829f73c232b531ea2981c043b17c3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:52:21 -0500
Subject: Check type of other for equals functions

Fixes #361
---
 ext/fg/js/source.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'ext/fg/js/source.js')

diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js
index 11d3ff0e..fa785ec4 100644
--- a/ext/fg/js/source.js
+++ b/ext/fg/js/source.js
@@ -82,7 +82,11 @@ class TextSourceRange {
     }
 
     equals(other) {
-        if (other === null) {
+        if (!(
+            typeof other === 'object' &&
+            other !== null &&
+            other instanceof TextSourceRange
+        )) {
             return false;
         }
         if (this.imposterSourceElement !== null) {
@@ -409,6 +413,12 @@ class TextSourceElement {
     }
 
     equals(other) {
-        return other && other.element === this.element && other.content === this.content;
+        return (
+            typeof other === 'object' &&
+            other !== null &&
+            other instanceof TextSourceElement &&
+            other.element === this.element &&
+            other.content === this.content
+        );
     }
 }
-- 
cgit v1.2.3


From 53220af68eabdda27b35224056f3bd589e8c4785 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:49:52 -0500
Subject: Don't use innerHTML

---
 ext/bg/js/search-query-parser.js | 2 +-
 ext/fg/js/source.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/fg/js/source.js')

diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index 8c434990..0d4aaa50 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -164,7 +164,7 @@ class QueryParser extends TextScanner {
     }
 
     renderParserSelect() {
-        this.queryParserSelect.innerHTML = '';
+        this.queryParserSelect.textContent = '';
         if (this.parseResults.length > 1) {
             const select = this.queryParserGenerator.createParserSelect(this.parseResults, this.selectedParser);
             select.addEventListener('change', this.onParserChange.bind(this));
diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js
index fa785ec4..6dc482bd 100644
--- a/ext/fg/js/source.js
+++ b/ext/fg/js/source.js
@@ -366,7 +366,7 @@ class TextSourceElement {
     setEndOffset(length) {
         switch (this.element.nodeName.toUpperCase()) {
             case 'BUTTON':
-                this.content = this.element.innerHTML;
+                this.content = this.element.textContent;
                 break;
             case 'IMG':
                 this.content = this.element.getAttribute('alt');
-- 
cgit v1.2.3