From 2dbb24ea0416cb83185b6f92624bd9b6e937eade Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 21:01:00 -0500
Subject: Improve error messages when Interface server is invalid

---
 ext/bg/js/settings/anki.js | 8 +++++++-
 ext/bg/settings.html       | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki.js
index 9adb2f2a..3b0912d4 100644
--- a/ext/bg/js/settings/anki.js
+++ b/ext/bg/js/settings/anki.js
@@ -35,9 +35,15 @@ function _ankiSetError(error) {
     const node = document.querySelector('#anki-error');
     if (!node) { return; }
     if (error) {
+        const errorString = `${error}`;
         node.hidden = false;
-        node.textContent = `${error}`;
+        node.textContent = errorString;
         _ankiSetErrorData(node, error);
+
+        const node2 = document.querySelector('#anki-invalid-response-error');
+        if (node2 !== null) {
+            node2.hidden = (errorString.indexOf('Invalid response') < 0);
+        }
     } else {
         node.hidden = true;
         node.textContent = '';
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 3e06d4b5..8c787aff 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -760,6 +760,13 @@
 
                     <div class="alert alert-danger" id="anki-error" hidden></div>
 
+                    <div class="alert alert-danger" id="anki-invalid-response-error" hidden>
+                        Attempting to connect to Anki can sometimes return an error message which includes "Invalid response",
+                        which may indicate that the value of the <strong>Interface server</strong> option is incorrect.
+                        The <strong>Show advanced options</strong> checkbox under General Options must be ticked ticked to show this option.
+                        Resetting it to the default value may fix issues that are occurring.
+                    </div>
+
                     <div class="form-group">
                         <label for="card-tags">Card tags <span class="label-light">(comma or space separated)</span></label>
                         <input type="text" id="card-tags" class="form-control">
@@ -771,7 +778,7 @@
                     </div>
 
                     <div class="form-group options-advanced">
-                        <label for="interface-server">Interface server</label>
+                        <label for="interface-server">Interface server <span class="label-light">(Default: http://127.0.0.1:8765)</span></label>
                         <input type="text" id="interface-server" class="form-control">
                     </div>
 
-- 
cgit v1.2.3


From dd019ecf687299b0d2238312de7c476b2a263107 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 27 Jan 2020 23:24:34 +0200
Subject: fix audio index in resultOutputMode = 'merge'

---
 ext/mixed/js/display.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index c4be02f2..16bad3d9 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -176,7 +176,12 @@ class Display {
         const entry = link.closest('.entry');
         const definitionIndex = this.entryIndexFind(entry);
         const expressionIndex = Display.indexOf(entry.querySelectorAll('.term-expression .action-play-audio'), link);
-        this.audioPlay(this.definitions[definitionIndex], expressionIndex, definitionIndex);
+        this.audioPlay(
+            this.definitions[definitionIndex],
+            // expressionIndex is used in audioPlay to detect result output mode
+            Math.max(expressionIndex, this.options.general.resultOutputMode === 'merge' ? 0 : -1),
+            definitionIndex
+        );
     }
 
     onNoteAdd(e) {
-- 
cgit v1.2.3


From 02e0e24153eb95b45057cfc92cadb6563b229cc1 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 27 Jan 2020 23:28:01 +0200
Subject: change jpod101 kana check to detect katakana

---
 ext/bg/js/audio.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js
index 36ac413b..d1e4af9e 100644
--- a/ext/bg/js/audio.js
+++ b/ext/bg/js/audio.js
@@ -22,7 +22,7 @@ const audioUrlBuilders = new Map([
         let kana = definition.reading;
         let kanji = definition.expression;
 
-        if (!kana && wanakana.isHiragana(kanji)) {
+        if (!kana && jpIsStringEntirelyKana(kanji)) {
             kana = kanji;
             kanji = null;
         }
-- 
cgit v1.2.3


From 05bb4aef71c5c062b451dd04dcd55111f7ba7377 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Tue, 28 Jan 2020 02:34:05 +0200
Subject: partially revert be77544d77ba1f07955d76ebba1ab36286f0e52f

---
 ext/mixed/css/display.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index add2583e..55e76ab7 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -237,7 +237,7 @@ button.action-button {
     border-top-style: solid;
 }
 
-.entry[data-type=term][data-expression-multi=true]:not([data-expression-count="1"]) .actions>.action-play-audio {
+.entry[data-type=term][data-expression-multi=true] .actions>.action-play-audio {
     display: none;
 }
 
@@ -284,13 +284,13 @@ button.action-button {
     content: "\3001";
 }
 
-.term-expression-list>.term-expression:last-of-type:not(:first-of-type):after {
+.term-expression-list[data-multi=true]>.term-expression:last-of-type:after {
     font-size: 2em;
     content: "\3000";
     visibility: hidden;
 }
 
-.term-expression-list[data-multi=true]:not([data-count="1"]) .term-expression-details {
+.term-expression-list[data-multi=true] .term-expression-details {
     display: inline-block;
     position: relative;
     width: 0;
@@ -298,21 +298,21 @@ button.action-button {
     visibility: hidden;
 }
 
-.term-expression-list[data-multi=true]:not([data-count="1"]) .term-expression:hover .term-expression-details {
+.term-expression-list[data-multi=true] .term-expression:hover .term-expression-details {
     visibility: visible;
 }
 
-.term-expression-list[data-multi=true]:not([data-count="1"]) .term-expression-details>.action-play-audio {
+.term-expression-list[data-multi=true] .term-expression-details>.action-play-audio {
     position: absolute;
     left: 0;
     bottom: 0.5em;
 }
 
-.term-expression-list[data-multi=true]:not([data-count="1"]) .term-expression-details>.action-play-audio {
+.term-expression-list[data-multi=true] .term-expression-details>.action-play-audio {
     display: block;
 }
 
-.term-expression-list[data-multi=true]:not([data-count="1"]) .term-expression-details>.tags {
+.term-expression-list[data-multi=true] .term-expression-details>.tags {
     display: block;
     position: absolute;
     left: 0;
@@ -320,7 +320,7 @@ button.action-button {
     white-space: nowrap;
 }
 
-.term-expression-list[data-multi=true]:not([data-count="1"]) .term-expression-details>.frequencies {
+.term-expression-list[data-multi=true] .term-expression-details>.frequencies {
     display: block;
     position: absolute;
     left: 0;
-- 
cgit v1.2.3


From dd700af0be94d33802dfc71e2c14abbad8a34578 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 29 Jan 2020 19:52:24 -0500
Subject: Fix tag double click

---
 ext/mixed/css/display.css         | 8 ++++++--
 ext/mixed/display-templates.html  | 4 ++--
 ext/mixed/js/display-generator.js | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 55e76ab7..8bbd5731 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -208,17 +208,21 @@ button.action-button {
 }
 
 .tag {
-    display: inline;
+    display: inline-block;
     padding: 0.2em 0.6em 0.3em;
     font-size: 75%;
     font-weight: 700;
-    line-height: 1;
+    line-height: 1.25;
     text-align: center;
     white-space: nowrap;
     vertical-align: baseline;
     border-radius: 0.25em;
 }
 
+.tag-inner {
+    display: block;
+}
+
 .tag-list>.tag+.tag {
     margin-left: 0.375em;
 }
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 62f3c69c..eda9abd9 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -75,7 +75,7 @@
 <template id="kanji-glossary-item-template"><li class="kanji-glossary-item"><span class="kanji-glossary"></span></li></template>
 <template id="kanji-reading-template"><dd class="kanji-reading"></dd></template>
 
-<template id="tag-template"><span class="tag"></span></template>
-<template id="tag-frequency-template"><span class="tag" data-category="frequency"><span class="term-frequency-dictionary-name"></span><span class="term-frequency-separator"></span><span class="term-frequency-value"></span></template>
+<template id="tag-template"><span class="tag"><span class="tag-inner"></span></span></template>
+<template id="tag-frequency-template"><span class="tag" data-category="frequency"><span class="tag-inner"><span class="term-frequency-dictionary-name"></span><span class="term-frequency-separator"></span><span class="term-frequency-value"></span></span></template>
 
 </body></html>
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index e1710488..8c39d380 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -252,8 +252,10 @@ class DisplayGenerator {
     createTag(details) {
         const node = DisplayGenerator._instantiateTemplate(this._tagTemplate);
 
+        const inner = node.querySelector('.tag-inner');
+
         node.title = details.notes;
-        node.textContent = details.name;
+        inner.textContent = details.name;
         node.dataset.category = details.category;
 
         return node;
-- 
cgit v1.2.3


From db247a283784a0a01dca18f6afe325de7d110ba9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 29 Jan 2020 20:47:24 -0500
Subject: Fix double clicking reason and glossary text

---
 ext/mixed/css/display.css         | 12 +++++++++++-
 ext/mixed/display-templates.html  |  4 ++--
 ext/mixed/js/display-generator.js |  9 +++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 8bbd5731..b70ede90 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -249,7 +249,7 @@ button.action-button {
     display: inline-block;
 }
 
-.term-reasons>.term-reason+.term-reason:before {
+.term-reasons>.term-reason+.term-reason-separator+.term-reason:before {
     content: " \00AB  "; /* The two spaces is not a typo */
     display: inline;
 }
@@ -468,3 +468,13 @@ button.action-button {
     padding-left: 1.4em;
     list-style-type: decimal;
 }
+
+.term-glossary-separator,
+.term-reason-separator {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    font-size: 0;
+    opacity: 0;
+    white-space: pre;
+}
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index eda9abd9..e762f66b 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -31,8 +31,8 @@
     <ul class="term-glossary-list"></ul>
 </li></template>
 <template id="term-definition-only-template"><span class="term-definition-only"></span></template>
-<template id="term-glossary-item-template"><li class="term-glossary-item"><span class="term-glossary"></span></li></template>
-<template id="term-reason-template"><span class="term-reason"></span></template>
+<template id="term-glossary-item-template"><li class="term-glossary-item"><span class="term-glossary"></span><span class="term-glossary-separator">&#10;</span></li></template>
+<template id="term-reason-template"><span class="term-reason"></span><span class="term-reason-separator">&#10;</span></template>
 
 <template id="kanji-entry-template"><div class="entry" data-type="kanji">
     <div class="entry-header1">
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 8c39d380..0a57df80 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -110,10 +110,11 @@ class DisplayGenerator {
     }
 
     createTermReason(reason) {
-        const node = DisplayGenerator._instantiateTemplate(this._termReasonTemplate);
+        const fragment = DisplayGenerator._instantiateTemplateFragment(this._termReasonTemplate);
+        const node = fragment.querySelector('.term-reason');
         node.textContent = reason;
         node.dataset.reason = reason;
-        return node;
+        return fragment;
     }
 
     createTermDefinitionItem(details) {
@@ -378,4 +379,8 @@ class DisplayGenerator {
     static _instantiateTemplate(template) {
         return document.importNode(template.content.firstChild, true);
     }
+
+    static _instantiateTemplateFragment(template) {
+        return document.importNode(template.content, true);
+    }
 }
-- 
cgit v1.2.3


From 0762f13a6d4c2a434c55896294f70750a326da64 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 30 Jan 2020 18:59:32 -0500
Subject: Workaround Firefox text selection bug

---
 ext/mixed/css/display.css | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index b70ede90..3f6d3a7a 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -251,6 +251,7 @@ button.action-button {
 
 .term-reasons>.term-reason+.term-reason-separator+.term-reason:before {
     content: " \00AB  "; /* The two spaces is not a typo */
+    white-space: pre-wrap;
     display: inline;
 }
 
@@ -403,7 +404,16 @@ button.action-button {
 }
 
 :root[data-compact-glossaries=true] .term-glossary-list>li:not(:first-child):before {
+    white-space: pre-wrap;
     content: " | ";
+    display: inline;
+}
+
+.term-glossary-separator,
+.term-reason-separator {
+    display: inline;
+    font-size: 0;
+    opacity: 0;
 }
 
 /*
@@ -468,13 +478,3 @@ button.action-button {
     padding-left: 1.4em;
     list-style-type: decimal;
 }
-
-.term-glossary-separator,
-.term-reason-separator {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    font-size: 0;
-    opacity: 0;
-    white-space: pre;
-}
-- 
cgit v1.2.3


From 09a1214f49f89824aa7680b398fb93bc911ff6b8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 20:20:32 -0500
Subject: More fixes for Firefox

---
 ext/mixed/css/display.css        | 1 +
 ext/mixed/display-templates.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 3f6d3a7a..fefd500f 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -414,6 +414,7 @@ button.action-button {
     display: inline;
     font-size: 0;
     opacity: 0;
+    white-space: pre-wrap;
 }
 
 /*
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index e762f66b..6c611be9 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -31,8 +31,8 @@
     <ul class="term-glossary-list"></ul>
 </li></template>
 <template id="term-definition-only-template"><span class="term-definition-only"></span></template>
-<template id="term-glossary-item-template"><li class="term-glossary-item"><span class="term-glossary"></span><span class="term-glossary-separator">&#10;</span></li></template>
-<template id="term-reason-template"><span class="term-reason"></span><span class="term-reason-separator">&#10;</span></template>
+<template id="term-glossary-item-template"><li class="term-glossary-item"><span class="term-glossary-separator"> </span><span class="term-glossary"></span></li></template>
+<template id="term-reason-template"><span class="term-reason"></span><span class="term-reason-separator"> </span></template>
 
 <template id="kanji-entry-template"><div class="entry" data-type="kanji">
     <div class="entry-header1">
-- 
cgit v1.2.3


From 1d9332cb69d76818a1f6a422ceafc3a463c48d7c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 28 Jan 2020 18:58:14 -0500
Subject: Simplify getSequencedDefinitions and dictTermsMergeBySequence

---
 ext/bg/js/dictionary.js | 20 ++++++++++++--------
 ext/bg/js/translator.js | 16 ++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 67128725..7d6bf7ba 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -159,11 +159,14 @@ function dictTermsGroup(definitions, dictionaries) {
 }
 
 function dictTermsMergeBySequence(definitions, mainDictionary) {
-    const definitionsBySequence = {'-1': []};
+    const sequencedDefinitions = new Map();
+    const nonSequencedDefinitions = [];
     for (const definition of definitions) {
-        if (mainDictionary === definition.dictionary && definition.sequence >= 0) {
-            if (!definitionsBySequence[definition.sequence]) {
-                definitionsBySequence[definition.sequence] = {
+        const sequence = definition.sequence;
+        if (mainDictionary === definition.dictionary && sequence >= 0) {
+            sequencedDefinition = sequencedDefinitions.get(sequence);
+            if (typeof sequencedDefinition === 'undefined') {
+                sequencedDefinition = {
                     reasons: definition.reasons,
                     score: Number.MIN_SAFE_INTEGER,
                     expression: new Set(),
@@ -173,15 +176,16 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
                     dictionary: definition.dictionary,
                     definitions: []
                 };
+                sequencedDefinitions.set(sequence, sequencedDefinition);
+            } else {
+                sequencedDefinition.score = Math.max(sequencedDefinition.score, definition.score);
             }
-            const score = Math.max(definitionsBySequence[definition.sequence].score, definition.score);
-            definitionsBySequence[definition.sequence].score = score;
         } else {
-            definitionsBySequence['-1'].push(definition);
+            nonSequencedDefinitions.push(definition);
         }
     }
 
-    return definitionsBySequence;
+    return [sequencedDefinitions, nonSequencedDefinitions];
 }
 
 function dictTermsMergeByGloss(result, definitions, appendTo, mergedIndices) {
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index dfec54ac..d32f8c67 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -48,14 +48,14 @@ class Translator {
     }
 
     async getSequencedDefinitions(definitions, mainDictionary) {
-        const definitionsBySequence = dictTermsMergeBySequence(definitions, mainDictionary);
-        const defaultDefinitions = definitionsBySequence['-1'];
-
-        const sequenceList = Object.keys(definitionsBySequence).map((v) => Number(v)).filter((v) => v >= 0);
-        const sequencedDefinitions = sequenceList.map((key) => ({
-            definitions: definitionsBySequence[key],
-            rawDefinitions: []
-        }));
+        const [definitionsBySequence, defaultDefinitions] = dictTermsMergeBySequence(definitions, mainDictionary);
+
+        const sequenceList = [];
+        const sequencedDefinitions = [];
+        for (const [key, value] of definitionsBySequence.entries()) {
+            sequenceList.push(key);
+            sequencedDefinitions.push({definitions: value, rawDefinitions: []});
+        }
 
         for (const definition of await this.database.findTermsBySequenceBulk(sequenceList, mainDictionary)) {
             sequencedDefinitions[definition.index].rawDefinitions.push(definition);
-- 
cgit v1.2.3


From 6b9116ee498b562202da8c69d983c0e7bf45e15b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 28 Jan 2020 19:06:50 -0500
Subject: Fix term tags not always being displayed

---
 ext/mixed/js/display-generator.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 0a57df80..b2dc373b 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -71,7 +71,11 @@ class DisplayGenerator {
         node.dataset.expressionCount = `${expressionMulti ? details.expressions.length : 1}`;
         node.dataset.definitionCount = `${definitionMulti ? details.definitions.length : 1}`;
 
-        DisplayGenerator._appendMultiple(expressionsContainer, this.createTermExpression.bind(this), details.expressions, [details]);
+        const termTags = details.termTags;
+        let expressions = details.expressions;
+        expressions = Array.isArray(expressions) ? expressions.map((e) => [e, termTags]) : null;
+
+        DisplayGenerator._appendMultiple(expressionsContainer, this.createTermExpression.bind(this), expressions, [[details, termTags]]);
         DisplayGenerator._appendMultiple(reasonsContainer, this.createTermReason.bind(this), details.reasons);
         DisplayGenerator._appendMultiple(frequenciesContainer, this.createFrequencyTag.bind(this), details.frequencies);
         DisplayGenerator._appendMultiple(definitionsContainer, this.createTermDefinitionItem.bind(this), details.definitions, [details]);
@@ -83,7 +87,7 @@ class DisplayGenerator {
         return node;
     }
 
-    createTermExpression(details) {
+    createTermExpression([details, termTags]) {
         const node = DisplayGenerator._instantiateTemplate(this._termExpressionTemplate);
 
         const expressionContainer = node.querySelector('.term-expression-text');
@@ -103,7 +107,11 @@ class DisplayGenerator {
             DisplayGenerator._appendFurigana(expressionContainer, furiganaSegments, this._appendKanjiLinks.bind(this));
         }
 
-        DisplayGenerator._appendMultiple(tagContainer, this.createTag.bind(this), details.termTags);
+        if (!Array.isArray(termTags)) {
+            // Fallback
+            termTags = details.termTags;
+        }
+        DisplayGenerator._appendMultiple(tagContainer, this.createTag.bind(this), termTags);
         DisplayGenerator._appendMultiple(frequencyContainer, this.createFrequencyTag.bind(this), details.frequencies);
 
         return node;
-- 
cgit v1.2.3


From daf038544873a9c59511c73b49475c80cb0dc4d1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 10:34:13 -0500
Subject: Add declaration

---
 ext/bg/js/dictionary.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 7d6bf7ba..1dd88e28 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -164,7 +164,7 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
     for (const definition of definitions) {
         const sequence = definition.sequence;
         if (mainDictionary === definition.dictionary && sequence >= 0) {
-            sequencedDefinition = sequencedDefinitions.get(sequence);
+            let sequencedDefinition = sequencedDefinitions.get(sequence);
             if (typeof sequencedDefinition === 'undefined') {
                 sequencedDefinition = {
                     reasons: definition.reasons,
-- 
cgit v1.2.3


From 5541aae2012785894fbb52b2767cce5be9a6f5ba Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 20:35:21 -0500
Subject: Assign valid score during construction

---
 ext/bg/js/dictionary.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 1dd88e28..48f65d6c 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -168,7 +168,7 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
             if (typeof sequencedDefinition === 'undefined') {
                 sequencedDefinition = {
                     reasons: definition.reasons,
-                    score: Number.MIN_SAFE_INTEGER,
+                    score: definition.score,
                     expression: new Set(),
                     reading: new Set(),
                     expressions: new Map(),
-- 
cgit v1.2.3


From 566012f228452a4113e83f76d1c53be1f1f41643 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 11:40:17 -0500
Subject: Use await

---
 ext/bg/js/settings/dictionaries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index ed171ae9..545e128d 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -427,7 +427,7 @@ async function onDictionaryMainChanged(e) {
     const optionsContext = getOptionsContext();
     const options = await getOptionsMutable(optionsContext);
     options.general.mainDictionary = value;
-    settingsSaveOptions();
+    await settingsSaveOptions();
 }
 
 
-- 
cgit v1.2.3


From 748cd27ad09526e4ec8fd309c6a85fdba1e2462c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 11:20:50 -0500
Subject: Remove argument from onDictionaryOptionsChanged

---
 ext/bg/js/settings/dictionaries.js | 8 ++++++--
 ext/bg/js/settings/main.js         | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 545e128d..31f47bfd 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -361,12 +361,16 @@ async function dictSettingsInitialize() {
 
     const optionsContext = getOptionsContext();
     const options = await getOptionsMutable(optionsContext);
-    onDictionaryOptionsChanged(options);
+    onDictionaryOptionsChanged();
     onDatabaseUpdated(options);
 }
 
-async function onDictionaryOptionsChanged(options) {
+async function onDictionaryOptionsChanged() {
     if (dictionaryUI === null) { return; }
+
+    const optionsContext = getOptionsContext();
+    const options = await getOptionsMutable(optionsContext);
+
     dictionaryUI.setOptionsDictionaries(options.dictionaries);
 
     const optionsFull = await apiOptionsGetFull();
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 3bf65eda..6e162ffc 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -167,7 +167,7 @@ async function formWrite(options) {
 
     await ankiTemplatesUpdateValue();
     await onAnkiOptionsChanged(options);
-    await onDictionaryOptionsChanged(options);
+    await onDictionaryOptionsChanged();
 
     formUpdateVisibility(options);
 }
-- 
cgit v1.2.3


From 55047def9dad485b4ad6e118c5d9eaed5d09af0c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 11:40:09 -0500
Subject: Separate the functionality of updateMainDictionarySelect

One function now updates the options, and another handles updating the value.
The options are no longer mutated due to updating this <select>'s available options.
---
 ext/bg/js/settings/dictionaries.js | 62 +++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 31f47bfd..221f5b13 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -272,9 +272,7 @@ class SettingsDictionaryEntryUI {
             this.isDeleting = false;
             progress.hidden = true;
 
-            const optionsContext = getOptionsContext();
-            const options = await getOptionsMutable(optionsContext);
-            onDatabaseUpdated(options);
+            onDatabaseUpdated();
         }
     }
 
@@ -359,10 +357,8 @@ async function dictSettingsInitialize() {
     document.querySelector('#dict-main').addEventListener('change', (e) => onDictionaryMainChanged(e), false);
     document.querySelector('#database-enable-prefix-wildcard-searches').addEventListener('change', (e) => onDatabaseEnablePrefixWildcardSearchesChanged(e), false);
 
-    const optionsContext = getOptionsContext();
-    const options = await getOptionsMutable(optionsContext);
     onDictionaryOptionsChanged();
-    onDatabaseUpdated(options);
+    onDatabaseUpdated();
 }
 
 async function onDictionaryOptionsChanged() {
@@ -377,14 +373,15 @@ async function onDictionaryOptionsChanged() {
     document.querySelector('#database-enable-prefix-wildcard-searches').checked = optionsFull.global.database.prefixWildcardsSupported;
 }
 
-async function onDatabaseUpdated(options) {
+async function onDatabaseUpdated() {
     try {
         const dictionaries = await utilDatabaseGetDictionaryInfo();
         dictionaryUI.setDictionaries(dictionaries);
 
         document.querySelector('#dict-warning').hidden = (dictionaries.length > 0);
 
-        updateMainDictionarySelect(options, dictionaries);
+        updateMainDictionarySelectOptions(dictionaries);
+        await updateMainDictionarySelectValue();
 
         const {counts, total} = await utilDatabaseGetDictionaryCounts(dictionaries.map((v) => v.title), true);
         dictionaryUI.setCounts(counts, total);
@@ -393,7 +390,7 @@ async function onDatabaseUpdated(options) {
     }
 }
 
-async function updateMainDictionarySelect(options, dictionaries) {
+function updateMainDictionarySelectOptions(dictionaries) {
     const select = document.querySelector('#dict-main');
     select.textContent = ''; // Empty
 
@@ -403,8 +400,6 @@ async function updateMainDictionarySelect(options, dictionaries) {
     option.textContent = 'Not selected';
     select.appendChild(option);
 
-    let value = '';
-    const currentValue = options.general.mainDictionary;
     for (const {title, sequenced} of toIterable(dictionaries)) {
         if (!sequenced) { continue; }
 
@@ -412,18 +407,41 @@ async function updateMainDictionarySelect(options, dictionaries) {
         option.value = title;
         option.textContent = title;
         select.appendChild(option);
+    }
+}
+
+async function updateMainDictionarySelectValue() {
+    const optionsContext = getOptionsContext();
+    const options = await apiOptionsGet(optionsContext);
+
+    const value = options.general.mainDictionary;
+
+    const select = document.querySelector('#dict-main');
+    let selectValue = null;
+    for (const child of select.children) {
+        if (child.nodeName.toUpperCase() === 'OPTION' && child.value === value) {
+            selectValue = value;
+            break;
+        }
+    }
 
-        if (title === currentValue) {
-            value = title;
+    let missingNodeOption = select.querySelector('option[data-not-installed=true]');
+    if (selectValue === null) {
+        if (missingNodeOption === null) {
+            missingNodeOption = document.createElement('option');
+            missingNodeOption.className = 'text-muted';
+            missingNodeOption.value = value;
+            missingNodeOption.textContent = `${value} (Not installed)`;
+            missingNodeOption.dataset.notInstalled = 'true';
+            select.appendChild(missingNodeOption);
+        }
+    } else {
+        if (missingNodeOption !== null) {
+            missingNodeOption.parentNode.removeChild(missingNodeOption);
         }
     }
 
     select.value = value;
-
-    if (options.general.mainDictionary !== value) {
-        options.general.mainDictionary = value;
-        settingsSaveOptions();
-    }
 }
 
 async function onDictionaryMainChanged(e) {
@@ -541,9 +559,7 @@ async function onDictionaryPurge(e) {
         }
         await settingsSaveOptions();
 
-        const optionsContext = getOptionsContext();
-        const options = await getOptionsMutable(optionsContext);
-        onDatabaseUpdated(options);
+        onDatabaseUpdated();
     } catch (err) {
         dictionaryErrorsShow([err]);
     } finally {
@@ -615,9 +631,7 @@ async function onDictionaryImport(e) {
                 dictionaryErrorsShow(errors);
             }
 
-            const optionsContext = getOptionsContext();
-            const options = await getOptionsMutable(optionsContext);
-            onDatabaseUpdated(options);
+            onDatabaseUpdated();
         }
     } catch (err) {
         dictionaryErrorsShow([err]);
-- 
cgit v1.2.3


From 8eaa0334acf4f36a05fa881571019532e325f4a6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 11:42:27 -0500
Subject: Remove option for dictionaries that aren't installed after changing
 values

---
 ext/bg/js/settings/dictionaries.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 221f5b13..2355f807 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -445,7 +445,14 @@ async function updateMainDictionarySelectValue() {
 }
 
 async function onDictionaryMainChanged(e) {
-    const value = e.target.value;
+    const select = e.target;
+    const value = select.value;
+
+    const missingNodeOption = select.querySelector('option[data-not-installed=true]');
+    if (missingNodeOption !== null && missingNodeOption.value !== value) {
+        missingNodeOption.parentNode.removeChild(missingNodeOption);
+    }
+
     const optionsContext = getOptionsContext();
     const options = await getOptionsMutable(optionsContext);
     options.general.mainDictionary = value;
-- 
cgit v1.2.3


From d5c0155a82cd67445d617aeb2e314c3839bc2c71 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 11:48:24 -0500
Subject: Update main dictionary value when changing modifying profile

---
 ext/bg/js/settings/dictionaries.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 2355f807..0d827f49 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -357,8 +357,8 @@ async function dictSettingsInitialize() {
     document.querySelector('#dict-main').addEventListener('change', (e) => onDictionaryMainChanged(e), false);
     document.querySelector('#database-enable-prefix-wildcard-searches').addEventListener('change', (e) => onDatabaseEnablePrefixWildcardSearchesChanged(e), false);
 
-    onDictionaryOptionsChanged();
-    onDatabaseUpdated();
+    await onDictionaryOptionsChanged();
+    await onDatabaseUpdated();
 }
 
 async function onDictionaryOptionsChanged() {
@@ -371,6 +371,8 @@ async function onDictionaryOptionsChanged() {
 
     const optionsFull = await apiOptionsGetFull();
     document.querySelector('#database-enable-prefix-wildcard-searches').checked = optionsFull.global.database.prefixWildcardsSupported;
+
+    await updateMainDictionarySelectValue();
 }
 
 async function onDatabaseUpdated() {
-- 
cgit v1.2.3


From 24690ceb7c0fc2af9ebd33971dece22eb2bd1d03 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 2 Feb 2020 13:44:08 +0200
Subject: fix glossary item selector

---
 ext/mixed/js/display.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 16bad3d9..70ef8ec3 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -312,9 +312,9 @@ class Display {
             this.addEventListeners('.action-play-audio', 'click', this.onAudioPlay.bind(this));
             this.addEventListeners('.kanji-link', 'click', this.onKanjiLookup.bind(this));
             if (this.options.scanning.enablePopupSearch) {
-                this.addEventListeners('.glossary-item', 'mouseup', this.onGlossaryMouseUp.bind(this));
-                this.addEventListeners('.glossary-item', 'mousedown', this.onGlossaryMouseDown.bind(this));
-                this.addEventListeners('.glossary-item', 'mousemove', this.onGlossaryMouseMove.bind(this));
+                this.addEventListeners('.term-glossary-item', 'mouseup', this.onGlossaryMouseUp.bind(this));
+                this.addEventListeners('.term-glossary-item', 'mousedown', this.onGlossaryMouseDown.bind(this));
+                this.addEventListeners('.term-glossary-item', 'mousemove', this.onGlossaryMouseMove.bind(this));
             }
         } else {
             Display.clearEventListeners(this.eventListeners);
-- 
cgit v1.2.3


From b8326138a3254e82dd42e1517f371287bdfc6705 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 26 Jan 2020 21:00:19 +0200
Subject: add scannable tags for expression and reading

---
 ext/bg/data/options-schema.json   |  7 ++++++-
 ext/bg/js/options.js              |  3 ++-
 ext/bg/js/settings/main.js        |  2 ++
 ext/bg/settings.html              |  6 +++++-
 ext/mixed/css/display-dark.css    |  1 +
 ext/mixed/css/display-default.css |  1 +
 ext/mixed/css/display.css         |  4 ++++
 ext/mixed/display-templates.html  |  1 +
 ext/mixed/js/display-generator.js | 15 +++++++++++++++
 ext/mixed/js/display.js           |  7 ++++---
 10 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json
index a20a0619..7e12481d 100644
--- a/ext/bg/data/options-schema.json
+++ b/ext/bg/data/options-schema.json
@@ -290,7 +290,8 @@
                                     "popupNestingMaxDepth",
                                     "enablePopupSearch",
                                     "enableOnPopupExpressions",
-                                    "enableOnSearchPage"
+                                    "enableOnSearchPage",
+                                    "enableSearchTags"
                                 ],
                                 "properties": {
                                     "middleMouse": {
@@ -348,6 +349,10 @@
                                     "enableOnSearchPage": {
                                         "type": "boolean",
                                         "default": true
+                                    },
+                                    "enableSearchTags": {
+                                        "type": "boolean",
+                                        "default": false
                                     }
                                 }
                             },
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index d93862bf..78508059 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -316,7 +316,8 @@ function profileOptionsCreateDefaults() {
             popupNestingMaxDepth: 0,
             enablePopupSearch: false,
             enableOnPopupExpressions: false,
-            enableOnSearchPage: true
+            enableOnSearchPage: true,
+            enableSearchTags: false
         },
 
         translation: {
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 6e162ffc..4492cd42 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -67,6 +67,7 @@ async function formRead(options) {
     options.scanning.enablePopupSearch = $('#enable-search-within-first-popup').prop('checked');
     options.scanning.enableOnPopupExpressions = $('#enable-scanning-of-popup-expressions').prop('checked');
     options.scanning.enableOnSearchPage = $('#enable-scanning-on-search-page').prop('checked');
+    options.scanning.enableSearchTags = $('#enable-search-tags').prop('checked');
     options.scanning.delay = parseInt($('#scan-delay').val(), 10);
     options.scanning.length = parseInt($('#scan-length').val(), 10);
     options.scanning.modifier = $('#scan-modifier-key').val();
@@ -142,6 +143,7 @@ async function formWrite(options) {
     $('#enable-search-within-first-popup').prop('checked', options.scanning.enablePopupSearch);
     $('#enable-scanning-of-popup-expressions').prop('checked', options.scanning.enableOnPopupExpressions);
     $('#enable-scanning-on-search-page').prop('checked', options.scanning.enableOnSearchPage);
+    $('#enable-search-tags').prop('checked', options.scanning.enableSearchTags);
     $('#scan-delay').val(options.scanning.delay);
     $('#scan-length').val(options.scanning.length);
     $('#scan-modifier-key').val(options.scanning.modifier);
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 8c787aff..77bcc359 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -481,7 +481,7 @@
                 </p>
 
                 <div class="checkbox">
-                    <label><input type="checkbox" id="enable-search-within-first-popup"> Enable search when clicking glossary entries</label>
+                    <label><input type="checkbox" id="enable-search-within-first-popup"> Enable search when clicking glossary entries and tags</label>
                 </div>
 
                 <div class="checkbox">
@@ -492,6 +492,10 @@
                     <label><input type="checkbox" id="enable-scanning-of-popup-expressions"> Enable scanning of expressions in search results</label>
                 </div>
 
+                <div class="checkbox">
+                    <label><input type="checkbox" id="enable-search-tags"> Enable clickable and scannable tags for searching expressions and their readings</label>
+                </div>
+
                 <div class="form-group">
                     <label for="popup-nesting-max-depth">Maximum number of additional popups</label>
                     <input type="number" min="0" step="1" id="popup-nesting-max-depth" class="form-control">
diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 088fc741..c9cd9f90 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -38,6 +38,7 @@ body { background-color: #1e1e1e; color: #d4d4d4; }
 .tag[data-category=dictionary]   { background-color: #9057ad; }
 .tag[data-category=frequency]    { background-color: #489148; }
 .tag[data-category=partOfSpeech] { background-color: #565656; }
+.tag[data-category=search]       { background-color: #69696e; }
 
 .term-reasons { color: #888888; }
 
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 69141c9d..6eee43c4 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -38,6 +38,7 @@ body { background-color: #ffffff; color: #333333; }
 .tag[data-category=dictionary]   { background-color: #aa66cc; }
 .tag[data-category=frequency]    { background-color: #5cb85c; }
 .tag[data-category=partOfSpeech] { background-color: #565656; }
+.tag[data-category=search]       { background-color: #8a8a91; }
 
 .term-reasons { color: #777777; }
 
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index fefd500f..3a66cec3 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -227,6 +227,10 @@ button.action-button {
     margin-left: 0.375em;
 }
 
+html:root:not([data-enable-search-tags=true]) .tag[data-category=search] {
+    display: none;
+}
+
 .entry-header2,
 .entry-header3 {
     display: inline;
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 6c611be9..6fcf4c74 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -77,5 +77,6 @@
 
 <template id="tag-template"><span class="tag"><span class="tag-inner"></span></span></template>
 <template id="tag-frequency-template"><span class="tag" data-category="frequency"><span class="tag-inner"><span class="term-frequency-dictionary-name"></span><span class="term-frequency-separator"></span><span class="term-frequency-value"></span></span></template>
+<template id="tag-search-template"><span class="tag" data-category="search"></span></template>
 
 </body></html>
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index b2dc373b..c90e693a 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -111,7 +111,11 @@ class DisplayGenerator {
             // Fallback
             termTags = details.termTags;
         }
+        const searchQueries = [details.expression, details.reading]
+            .filter((x) => !!x)
+            .map((x) => ({query: x}));
         DisplayGenerator._appendMultiple(tagContainer, this.createTag.bind(this), termTags);
+        DisplayGenerator._appendMultiple(tagContainer, this.createSearchTag.bind(this), searchQueries);
         DisplayGenerator._appendMultiple(frequencyContainer, this.createFrequencyTag.bind(this), details.frequencies);
 
         return node;
@@ -270,6 +274,16 @@ class DisplayGenerator {
         return node;
     }
 
+    createSearchTag(details) {
+        const node = DisplayGenerator._instantiateTemplate(this._tagSearchTemplate);
+
+        node.textContent = details.query;
+
+        node.dataset.query = details.query;
+
+        return node;
+    }
+
     createFrequencyTag(details) {
         const node = DisplayGenerator._instantiateTemplate(this._tagFrequencyTemplate);
 
@@ -311,6 +325,7 @@ class DisplayGenerator {
         this._kanjiReadingTemplate = doc.querySelector('#kanji-reading-template');
 
         this._tagTemplate = doc.querySelector('#tag-template');
+        this._tagSearchTemplate = doc.querySelector('#tag-search-template');
         this._tagFrequencyTemplate = doc.querySelector('#tag-frequency-template');
     }
 
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 70ef8ec3..54cda0eb 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -257,6 +257,7 @@ class Display {
         data.ankiEnabled = `${options.anki.enable}`;
         data.audioEnabled = `${options.audio.enable}`;
         data.compactGlossaries = `${options.general.compactGlossaries}`;
+        data.enableSearchTags = `${options.scanning.enableSearchTags}`;
         data.debug = `${options.general.debugInfo}`;
     }
 
@@ -312,9 +313,9 @@ class Display {
             this.addEventListeners('.action-play-audio', 'click', this.onAudioPlay.bind(this));
             this.addEventListeners('.kanji-link', 'click', this.onKanjiLookup.bind(this));
             if (this.options.scanning.enablePopupSearch) {
-                this.addEventListeners('.term-glossary-item', 'mouseup', this.onGlossaryMouseUp.bind(this));
-                this.addEventListeners('.term-glossary-item', 'mousedown', this.onGlossaryMouseDown.bind(this));
-                this.addEventListeners('.term-glossary-item', 'mousemove', this.onGlossaryMouseMove.bind(this));
+                this.addEventListeners('.term-glossary-item, .tag', 'mouseup', this.onGlossaryMouseUp.bind(this));
+                this.addEventListeners('.term-glossary-item, .tag', 'mousedown', this.onGlossaryMouseDown.bind(this));
+                this.addEventListeners('.term-glossary-item, .tag', 'mousemove', this.onGlossaryMouseMove.bind(this));
             }
         } else {
             Display.clearEventListeners(this.eventListeners);
-- 
cgit v1.2.3


From f23e0c9c95a7c0803694ea91b0ea55079e8f52d6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 20:51:30 -0500
Subject: Validate Deinflector.ruleTypes

---
 ext/bg/js/deinflector.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index 33b2a8b3..e2ced965 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -76,17 +76,19 @@ class Deinflector {
         const ruleTypes = Deinflector.ruleTypes;
         let value = 0;
         for (const rule of rules) {
-            value |= ruleTypes[rule];
+            const ruleBits = ruleTypes.get(rule);
+            if (typeof ruleBits === 'undefined') { continue; }
+            value |= ruleBits;
         }
         return value;
     }
 }
 
-Deinflector.ruleTypes = {
-    'v1':    0b0000001, // Verb ichidan
-    'v5':    0b0000010, // Verb godan
-    'vs':    0b0000100, // Verb suru
-    'vk':    0b0001000, // Verb kuru
-    'adj-i': 0b0010000, // Adjective i
-    'iru':   0b0100000  // Intermediate -iru endings for progressive or perfect tense
-};
+Deinflector.ruleTypes = new Map([
+    ['v1',    0b0000001], // Verb ichidan
+    ['v5',    0b0000010], // Verb godan
+    ['vs',    0b0000100], // Verb suru
+    ['vk',    0b0001000], // Verb kuru
+    ['adj-i', 0b0010000], // Adjective i
+    ['iru',   0b0100000] // Intermediate -iru endings for progressive or perfect tense
+]);
-- 
cgit v1.2.3


From 0b474751b5fb994d402caf3d0515d95680684b60 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 11:06:03 -0500
Subject: Add simplified isObject test

---
 ext/bg/js/json-schema.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 5d596a8b..2b7c9f27 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -131,19 +131,19 @@ class JsonSchemaProxyHandler {
             case 'object':
             {
                 const properties = schema.properties;
-                if (properties !== null && typeof properties === 'object' && !Array.isArray(properties)) {
+                if (JsonSchemaProxyHandler.isObject(properties)) {
                     if (Object.prototype.hasOwnProperty.call(properties, property)) {
                         return properties[property];
                     }
                 }
 
                 const additionalProperties = schema.additionalProperties;
-                return (additionalProperties !== null && typeof additionalProperties === 'object' && !Array.isArray(additionalProperties)) ? additionalProperties : null;
+                return JsonSchemaProxyHandler.isObject(additionalProperties) ? additionalProperties : null;
             }
             case 'array':
             {
                 const items = schema.items;
-                return (items !== null && typeof items === 'object' && !Array.isArray(items)) ? items : null;
+                return JsonSchemaProxyHandler.isObject(items) ? items : null;
             }
             default:
                 return null;
@@ -399,6 +399,10 @@ class JsonSchemaProxyHandler {
 
         return value;
     }
+
+    static isObject(value) {
+        return typeof value === 'object' && value !== null && !Array.isArray(value);
+    }
 }
 
 class JsonSchema {
-- 
cgit v1.2.3


From 6595715f7cdf1c4d0de743443b88eba05d7d6ae1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 10:57:52 -0500
Subject: Add support for allOf, anyOf, oneOf, and not

---
 ext/bg/js/json-schema.js | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 2b7c9f27..8129b6d2 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -151,6 +151,70 @@ class JsonSchemaProxyHandler {
     }
 
     static validate(value, schema) {
+        let result = JsonSchemaProxyHandler.validateSingleSchema(value, schema);
+        if (result !== null) { return result; }
+
+        result = JsonSchemaProxyHandler.validateAllOf(value, schema);
+        if (result !== null) { return result; }
+
+        result = JsonSchemaProxyHandler.validateAnyOf(value, schema);
+        if (result !== null) { return result; }
+
+        result = JsonSchemaProxyHandler.validateOneOf(value, schema);
+        if (result !== null) { return result; }
+
+        result = JsonSchemaProxyHandler.validateNoneOf(value, schema);
+        if (result !== null) { return result; }
+
+        return null;
+    }
+
+    static validateAllOf(value, schema) {
+        const subSchemas = schema.allOf;
+        if (!Array.isArray(subSchemas)) { return null; }
+
+        for (let i = 0; i < subSchemas.length; ++i) {
+            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+            if (result !== null) { return `allOf[${i}] schema didn't match: ${result}`; }
+        }
+        return null;
+    }
+
+    static validateAnyOf(value, schema) {
+        const subSchemas = schema.anyOf;
+        if (!Array.isArray(subSchemas)) { return null; }
+
+        for (let i = 0; i < subSchemas.length; ++i) {
+            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+            if (result === null) { return null; }
+        }
+        return '0 anyOf schemas matched';
+    }
+
+    static validateOneOf(value, schema) {
+        const subSchemas = schema.oneOf;
+        if (!Array.isArray(subSchemas)) { return null; }
+
+        let count = 0;
+        for (let i = 0; i < subSchemas.length; ++i) {
+            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+            if (result === null) { ++count; }
+        }
+        return count === 1 ? null : `${count} oneOf schemas matched`;
+    }
+
+    static validateNoneOf(value, schema) {
+        const subSchemas = schema.not;
+        if (!Array.isArray(subSchemas)) { return null; }
+
+        for (let i = 0; i < subSchemas.length; ++i) {
+            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+            if (result === null) { return `not[${i}] schema matched`; }
+        }
+        return null;
+    }
+
+    static validateSingleSchema(value, schema) {
         const type = JsonSchemaProxyHandler.getValueType(value);
         const schemaType = schema.type;
         if (!JsonSchemaProxyHandler.isValueTypeAny(value, type, schemaType)) {
-- 
cgit v1.2.3


From 203216986e82d8b6c654979791d1ff5172ba83ca Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 11:13:13 -0500
Subject: Add support for conditionals

---
 ext/bg/js/json-schema.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 8129b6d2..ab4a4817 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -154,6 +154,9 @@ class JsonSchemaProxyHandler {
         let result = JsonSchemaProxyHandler.validateSingleSchema(value, schema);
         if (result !== null) { return result; }
 
+        result = JsonSchemaProxyHandler.validateConditional(value, schema);
+        if (result !== null) { return result; }
+
         result = JsonSchemaProxyHandler.validateAllOf(value, schema);
         if (result !== null) { return result; }
 
@@ -169,6 +172,25 @@ class JsonSchemaProxyHandler {
         return null;
     }
 
+    static validateConditional(value, schema) {
+        const ifCondition = schema.if;
+        if (!JsonSchemaProxyHandler.isObject(ifCondition)) { return null; }
+
+        const thenSchema = schema.then;
+        if (JsonSchemaProxyHandler.isObject(thenSchema)) {
+            const result = JsonSchemaProxyHandler.validate(value, thenSchema);
+            if (result !== null) { return `then conditional didn't match: ${result}`; }
+        }
+
+        const elseSchema = schema.else;
+        if (JsonSchemaProxyHandler.isObject(elseSchema)) {
+            const result = JsonSchemaProxyHandler.validate(value, thenSchema);
+            if (result !== null) { return `else conditional didn't match: ${result}`; }
+        }
+
+        return null;
+    }
+
     static validateAllOf(value, schema) {
         const subSchemas = schema.allOf;
         if (!Array.isArray(subSchemas)) { return null; }
-- 
cgit v1.2.3


From a844698f153773d5255724ba48a00851418af009 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 15:45:31 -0500
Subject: Return unconstrained schema when additionalProperties is
 true/undefined

---
 ext/bg/js/json-schema.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index ab4a4817..7a7f2489 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -138,7 +138,13 @@ class JsonSchemaProxyHandler {
                 }
 
                 const additionalProperties = schema.additionalProperties;
-                return JsonSchemaProxyHandler.isObject(additionalProperties) ? additionalProperties : null;
+                if (additionalProperties === false) {
+                    return null;
+                } if (JsonSchemaProxyHandler.isObject(additionalProperties)) {
+                    return additionalProperties;
+                } else {
+                    return JsonSchemaProxyHandler._unconstrainedSchema;
+                }
             }
             case 'array':
             {
@@ -491,6 +497,8 @@ class JsonSchemaProxyHandler {
     }
 }
 
+JsonSchemaProxyHandler._unconstrainedSchema = {};
+
 class JsonSchema {
     static createProxy(target, schema) {
         return new Proxy(target, new JsonSchemaProxyHandler(schema));
-- 
cgit v1.2.3


From 980a1ddf745032a790a043e8040cdb7ec5b110ad Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 12:34:27 -0500
Subject: Improve support for array schemas

---
 ext/bg/js/json-schema.js | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 7a7f2489..f32176fd 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -149,7 +149,23 @@ class JsonSchemaProxyHandler {
             case 'array':
             {
                 const items = schema.items;
-                return JsonSchemaProxyHandler.isObject(items) ? items : null;
+                if (JsonSchemaProxyHandler.isObject(items)) {
+                    return items;
+                }
+                if (Array.isArray(items)) {
+                    if (property >= 0 && property < items.length) {
+                        return items[property];
+                    }
+                }
+
+                const additionalItems = schema.additionalItems;
+                if (additionalItems === false) {
+                    return null;
+                } else if (JsonSchemaProxyHandler.isObject(additionalItems)) {
+                    return additionalItems;
+                } else {
+                    return JsonSchemaProxyHandler._unconstrainedSchema;
+                }
             }
             default:
                 return null;
@@ -322,6 +338,18 @@ class JsonSchemaProxyHandler {
             return 'Array length too long';
         }
 
+        for (let i = 0, ii = value.length; i < ii; ++i) {
+            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value);
+            if (propertySchema === null) {
+                return `No schema found for array[${i}]`;
+            }
+
+            const error = JsonSchemaProxyHandler.validate(value[i], propertySchema);
+            if (error !== null) {
+                return error;
+            }
+        }
+
         return null;
     }
 
-- 
cgit v1.2.3


From 31dbeab67ce79a9c46053ce124ad3924f71b67cc Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 14:59:37 -0500
Subject: Add validate on JsonSchema

---
 ext/bg/js/json-schema.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index f32176fd..61bd3d43 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -532,6 +532,10 @@ class JsonSchema {
         return new Proxy(target, new JsonSchemaProxyHandler(schema));
     }
 
+    static validate(value, schema) {
+        return JsonSchemaProxyHandler.validate(value, schema);
+    }
+
     static getValidValueOrDefault(schema, value) {
         return JsonSchemaProxyHandler.getValidValueOrDefault(schema, value);
     }
-- 
cgit v1.2.3


From 52b623b5cdb1963aa1fb65228f9377e147708959 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 15:57:39 -0500
Subject: Improve getPropertySchema's type detection

---
 ext/bg/js/json-schema.js | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 61bd3d43..9b651f46 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -64,7 +64,7 @@ class JsonSchemaProxyHandler {
             }
         }
 
-        const propertySchema = JsonSchemaProxyHandler.getPropertySchema(this._schema, property);
+        const propertySchema = JsonSchemaProxyHandler.getPropertySchema(this._schema, property, target);
         if (propertySchema === null) {
             return;
         }
@@ -86,7 +86,7 @@ class JsonSchemaProxyHandler {
             }
         }
 
-        const propertySchema = JsonSchemaProxyHandler.getPropertySchema(this._schema, property);
+        const propertySchema = JsonSchemaProxyHandler.getPropertySchema(this._schema, property, target);
         if (propertySchema === null) {
             throw new Error(`Property ${property} not supported`);
         }
@@ -122,11 +122,8 @@ class JsonSchemaProxyHandler {
         throw new Error('construct not supported');
     }
 
-    static getPropertySchema(schema, property) {
-        const type = schema.type;
-        if (Array.isArray(type)) {
-            throw new Error(`Ambiguous property type for ${property}`);
-        }
+    static getPropertySchema(schema, property, value) {
+        const type = JsonSchemaProxyHandler.getSchemaOrValueType(schema, value);
         switch (type) {
             case 'object':
             {
@@ -172,6 +169,29 @@ class JsonSchemaProxyHandler {
         }
     }
 
+    static getSchemaOrValueType(schema, value) {
+        const type = schema.type;
+
+        if (Array.isArray(type)) {
+            if (typeof value !== 'undefined') {
+                const valueType = JsonSchemaProxyHandler.getValueType(value);
+                if (type.indexOf(valueType) >= 0) {
+                    return valueType;
+                }
+            }
+            throw new Error(`Ambiguous property type for ${property}`);
+        }
+
+        if (typeof type === 'undefined') {
+            if (typeof value !== 'undefined') {
+                return JsonSchemaProxyHandler.getValueType(value);
+            }
+            throw new Error(`No property type for ${property}`);
+        }
+
+        return type;
+    }
+
     static validate(value, schema) {
         let result = JsonSchemaProxyHandler.validateSingleSchema(value, schema);
         if (result !== null) { return result; }
@@ -376,7 +396,7 @@ class JsonSchemaProxyHandler {
         }
 
         for (const property of properties) {
-            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property);
+            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value);
             if (propertySchema === null) {
                 return `No schema found for ${property}`;
             }
@@ -492,14 +512,14 @@ class JsonSchemaProxyHandler {
             for (const property of required) {
                 properties.delete(property);
 
-                const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property);
+                const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value);
                 if (propertySchema === null) { continue; }
                 value[property] = JsonSchemaProxyHandler.getValidValueOrDefault(propertySchema, value[property]);
             }
         }
 
         for (const property of properties) {
-            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property);
+            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value);
             if (propertySchema === null) {
                 Reflect.deleteProperty(value, property);
             } else {
@@ -512,7 +532,7 @@ class JsonSchemaProxyHandler {
 
     static populateArrayDefaults(value, schema) {
         for (let i = 0, ii = value.length; i < ii; ++i) {
-            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i);
+            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value);
             if (propertySchema === null) { continue; }
             value[i] = JsonSchemaProxyHandler.getValidValueOrDefault(propertySchema, value[i]);
         }
-- 
cgit v1.2.3


From 0171d86b28e3a4373a2deabb4a4a8cf738ca2743 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 22:20:47 -0500
Subject: Fix maxLength check

---
 ext/bg/js/json-schema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 9b651f46..29873b52 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -339,7 +339,7 @@ class JsonSchemaProxyHandler {
             return 'String length too short';
         }
 
-        const maxLength = schema.minLength;
+        const maxLength = schema.maxLength;
         if (typeof maxLength === 'number' && value.length > maxLength) {
             return 'String length too long';
         }
-- 
cgit v1.2.3


From 36e641e00168b09e81aad7e234399d06ce12e619 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 22:57:27 -0500
Subject: getSchemaOrValueType return null

---
 ext/bg/js/json-schema.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 29873b52..c20cb502 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -179,14 +179,14 @@ class JsonSchemaProxyHandler {
                     return valueType;
                 }
             }
-            throw new Error(`Ambiguous property type for ${property}`);
+            return null;
         }
 
         if (typeof type === 'undefined') {
             if (typeof value !== 'undefined') {
                 return JsonSchemaProxyHandler.getValueType(value);
             }
-            throw new Error(`No property type for ${property}`);
+            return null;
         }
 
         return type;
-- 
cgit v1.2.3


From 964db7410863a5b840b101884c3c522389dd4e80 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 00:13:46 -0500
Subject: Update schema validation to throw errors

---
 ext/bg/js/json-schema.js | 158 ++++++++++++++++++++++-------------------------
 1 file changed, 74 insertions(+), 84 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index c20cb502..65fbce41 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -93,10 +93,7 @@ class JsonSchemaProxyHandler {
 
         value = JsonSchema.isolate(value);
 
-        const error = JsonSchemaProxyHandler.validate(value, propertySchema);
-        if (error !== null) {
-            throw new Error(`Invalid value: ${error}`);
-        }
+        JsonSchemaProxyHandler.validate(value, propertySchema);
 
         target[property] = value;
         return true;
@@ -193,184 +190,173 @@ class JsonSchemaProxyHandler {
     }
 
     static validate(value, schema) {
-        let result = JsonSchemaProxyHandler.validateSingleSchema(value, schema);
-        if (result !== null) { return result; }
-
-        result = JsonSchemaProxyHandler.validateConditional(value, schema);
-        if (result !== null) { return result; }
-
-        result = JsonSchemaProxyHandler.validateAllOf(value, schema);
-        if (result !== null) { return result; }
-
-        result = JsonSchemaProxyHandler.validateAnyOf(value, schema);
-        if (result !== null) { return result; }
-
-        result = JsonSchemaProxyHandler.validateOneOf(value, schema);
-        if (result !== null) { return result; }
-
-        result = JsonSchemaProxyHandler.validateNoneOf(value, schema);
-        if (result !== null) { return result; }
-
-        return null;
+        JsonSchemaProxyHandler.validateSingleSchema(value, schema);
+        JsonSchemaProxyHandler.validateConditional(value, schema);
+        JsonSchemaProxyHandler.validateAllOf(value, schema);
+        JsonSchemaProxyHandler.validateAnyOf(value, schema);
+        JsonSchemaProxyHandler.validateOneOf(value, schema);
+        JsonSchemaProxyHandler.validateNoneOf(value, schema);
     }
 
     static validateConditional(value, schema) {
         const ifCondition = schema.if;
-        if (!JsonSchemaProxyHandler.isObject(ifCondition)) { return null; }
+        if (!JsonSchemaProxyHandler.isObject(ifCondition)) { return; }
 
         const thenSchema = schema.then;
         if (JsonSchemaProxyHandler.isObject(thenSchema)) {
-            const result = JsonSchemaProxyHandler.validate(value, thenSchema);
-            if (result !== null) { return `then conditional didn't match: ${result}`; }
+            JsonSchemaProxyHandler.validate(value, thenSchema);
         }
 
         const elseSchema = schema.else;
         if (JsonSchemaProxyHandler.isObject(elseSchema)) {
-            const result = JsonSchemaProxyHandler.validate(value, thenSchema);
-            if (result !== null) { return `else conditional didn't match: ${result}`; }
+            JsonSchemaProxyHandler.validate(value, thenSchema);
         }
-
-        return null;
     }
 
     static validateAllOf(value, schema) {
         const subSchemas = schema.allOf;
-        if (!Array.isArray(subSchemas)) { return null; }
+        if (!Array.isArray(subSchemas)) { return; }
 
         for (let i = 0; i < subSchemas.length; ++i) {
-            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
-            if (result !== null) { return `allOf[${i}] schema didn't match: ${result}`; }
+            JsonSchemaProxyHandler.validate(value, subSchemas[i]);
         }
-        return null;
     }
 
     static validateAnyOf(value, schema) {
         const subSchemas = schema.anyOf;
-        if (!Array.isArray(subSchemas)) { return null; }
+        if (!Array.isArray(subSchemas)) { return; }
 
         for (let i = 0; i < subSchemas.length; ++i) {
-            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
-            if (result === null) { return null; }
+            try {
+                JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+                return;
+            } catch (e) {
+                // NOP
+            }
         }
-        return '0 anyOf schemas matched';
+
+        throw new JsonSchemaValidationError('0 anyOf schemas matched', value, schema);
     }
 
     static validateOneOf(value, schema) {
         const subSchemas = schema.oneOf;
-        if (!Array.isArray(subSchemas)) { return null; }
+        if (!Array.isArray(subSchemas)) { return; }
 
         let count = 0;
         for (let i = 0; i < subSchemas.length; ++i) {
-            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
-            if (result === null) { ++count; }
+            try {
+                JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+                ++count;
+            } catch (e) {
+                // NOP
+            }
+        }
+
+        if (count !== 1) {
+            throw new JsonSchemaValidationError(`${count} oneOf schemas matched`, value, schema);
         }
-        return count === 1 ? null : `${count} oneOf schemas matched`;
     }
 
     static validateNoneOf(value, schema) {
         const subSchemas = schema.not;
-        if (!Array.isArray(subSchemas)) { return null; }
+        if (!Array.isArray(subSchemas)) { return; }
 
         for (let i = 0; i < subSchemas.length; ++i) {
-            const result = JsonSchemaProxyHandler.validate(value, subSchemas[i]);
-            if (result === null) { return `not[${i}] schema matched`; }
+            try {
+                JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+            } catch (e) {
+                continue;
+            }
+            throw new JsonSchemaValidationError(`not[${i}] schema matched`, value, schema);
         }
-        return null;
     }
 
     static validateSingleSchema(value, schema) {
         const type = JsonSchemaProxyHandler.getValueType(value);
         const schemaType = schema.type;
         if (!JsonSchemaProxyHandler.isValueTypeAny(value, type, schemaType)) {
-            return `Value type ${type} does not match schema type ${schemaType}`;
+            throw new JsonSchemaValidationError(`Value type ${type} does not match schema type ${schemaType}`, value, schema);
         }
 
         const schemaEnum = schema.enum;
         if (Array.isArray(schemaEnum) && !JsonSchemaProxyHandler.valuesAreEqualAny(value, schemaEnum)) {
-            return 'Invalid enum value';
+            throw new JsonSchemaValidationError('Invalid enum value', value, schema);
         }
 
         switch (type) {
             case 'number':
-                return JsonSchemaProxyHandler.validateNumber(value, schema);
+                JsonSchemaProxyHandler.validateNumber(value, schema);
+                break;
             case 'string':
-                return JsonSchemaProxyHandler.validateString(value, schema);
+                JsonSchemaProxyHandler.validateString(value, schema);
+                break;
             case 'array':
-                return JsonSchemaProxyHandler.validateArray(value, schema);
+                JsonSchemaProxyHandler.validateArray(value, schema);
+                break;
             case 'object':
-                return JsonSchemaProxyHandler.validateObject(value, schema);
-            default:
-                return null;
+                JsonSchemaProxyHandler.validateObject(value, schema);
+                break;
         }
     }
 
     static validateNumber(value, schema) {
         const multipleOf = schema.multipleOf;
         if (typeof multipleOf === 'number' && Math.floor(value / multipleOf) * multipleOf !== value) {
-            return `Number is not a multiple of ${multipleOf}`;
+            throw new JsonSchemaValidationError(`Number is not a multiple of ${multipleOf}`, value, schema);
         }
 
         const minimum = schema.minimum;
         if (typeof minimum === 'number' && value < minimum) {
-            return `Number is less than ${minimum}`;
+            throw new JsonSchemaValidationError(`Number is less than ${minimum}`, value, schema);
         }
 
         const exclusiveMinimum = schema.exclusiveMinimum;
         if (typeof exclusiveMinimum === 'number' && value <= exclusiveMinimum) {
-            return `Number is less than or equal to ${exclusiveMinimum}`;
+            throw new JsonSchemaValidationError(`Number is less than or equal to ${exclusiveMinimum}`, value, schema);
         }
 
         const maximum = schema.maximum;
         if (typeof maximum === 'number' && value > maximum) {
-            return `Number is greater than ${maximum}`;
+            throw new JsonSchemaValidationError(`Number is greater than ${maximum}`, value, schema);
         }
 
         const exclusiveMaximum = schema.exclusiveMaximum;
         if (typeof exclusiveMaximum === 'number' && value >= exclusiveMaximum) {
-            return `Number is greater than or equal to ${exclusiveMaximum}`;
+            throw new JsonSchemaValidationError(`Number is greater than or equal to ${exclusiveMaximum}`, value, schema);
         }
-
-        return null;
     }
 
     static validateString(value, schema) {
         const minLength = schema.minLength;
         if (typeof minLength === 'number' && value.length < minLength) {
-            return 'String length too short';
+            throw new JsonSchemaValidationError('String length too short', value, schema);
         }
 
         const maxLength = schema.maxLength;
         if (typeof maxLength === 'number' && value.length > maxLength) {
-            return 'String length too long';
+            throw new JsonSchemaValidationError('String length too long', value, schema);
         }
-
-        return null;
     }
 
     static validateArray(value, schema) {
         const minItems = schema.minItems;
         if (typeof minItems === 'number' && value.length < minItems) {
-            return 'Array length too short';
+            throw new JsonSchemaValidationError('Array length too short', value, schema);
         }
 
         const maxItems = schema.maxItems;
         if (typeof maxItems === 'number' && value.length > maxItems) {
-            return 'Array length too long';
+            throw new JsonSchemaValidationError('Array length too long', value, schema);
         }
 
         for (let i = 0, ii = value.length; i < ii; ++i) {
             const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value);
             if (propertySchema === null) {
-                return `No schema found for array[${i}]`;
+                throw new JsonSchemaValidationError(`No schema found for array[${i}]`, value, schema);
             }
 
-            const error = JsonSchemaProxyHandler.validate(value[i], propertySchema);
-            if (error !== null) {
-                return error;
-            }
+            JsonSchemaProxyHandler.validate(value[i], propertySchema);
         }
-
-        return null;
     }
 
     static validateObject(value, schema) {
@@ -380,33 +366,28 @@ class JsonSchemaProxyHandler {
         if (Array.isArray(required)) {
             for (const property of required) {
                 if (!properties.has(property)) {
-                    return `Missing property ${property}`;
+                    throw new JsonSchemaValidationError(`Missing property ${property}`, value, schema);
                 }
             }
         }
 
         const minProperties = schema.minProperties;
         if (typeof minProperties === 'number' && properties.length < minProperties) {
-            return 'Not enough object properties';
+            throw new JsonSchemaValidationError('Not enough object properties', value, schema);
         }
 
         const maxProperties = schema.maxProperties;
         if (typeof maxProperties === 'number' && properties.length > maxProperties) {
-            return 'Too many object properties';
+            throw new JsonSchemaValidationError('Too many object properties', value, schema);
         }
 
         for (const property of properties) {
             const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value);
             if (propertySchema === null) {
-                return `No schema found for ${property}`;
-            }
-            const error = JsonSchemaProxyHandler.validate(value[property], propertySchema);
-            if (error !== null) {
-                return error;
+                throw new JsonSchemaValidationError(`No schema found for ${property}`, value, schema);
             }
+            JsonSchemaProxyHandler.validate(value[property], propertySchema);
         }
-
-        return null;
     }
 
     static isValueTypeAny(value, type, schemaTypes) {
@@ -547,6 +528,15 @@ class JsonSchemaProxyHandler {
 
 JsonSchemaProxyHandler._unconstrainedSchema = {};
 
+class JsonSchemaValidationError extends Error {
+    constructor(message, value, schema, path) {
+        super(message);
+        this.value = value;
+        this.schema = schema;
+        this.path = path;
+    }
+}
+
 class JsonSchema {
     static createProxy(target, schema) {
         return new Proxy(target, new JsonSchemaProxyHandler(schema));
-- 
cgit v1.2.3


From 7c9fe2c6cf52e61620ff36853fa0dee1b93594f5 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 10:17:16 -0500
Subject: Fix conditional logic

---
 ext/bg/js/json-schema.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 65fbce41..97429211 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -199,17 +199,19 @@ class JsonSchemaProxyHandler {
     }
 
     static validateConditional(value, schema) {
-        const ifCondition = schema.if;
-        if (!JsonSchemaProxyHandler.isObject(ifCondition)) { return; }
+        const ifSchema = schema.if;
+        if (!JsonSchemaProxyHandler.isObject(ifSchema)) { return; }
 
-        const thenSchema = schema.then;
-        if (JsonSchemaProxyHandler.isObject(thenSchema)) {
+        let okay = true;
+        try {
             JsonSchemaProxyHandler.validate(value, thenSchema);
+        } catch (e) {
+            okay = false;
         }
 
-        const elseSchema = schema.else;
-        if (JsonSchemaProxyHandler.isObject(elseSchema)) {
-            JsonSchemaProxyHandler.validate(value, thenSchema);
+        const nextSchema = okay ? schema.then : schema.else;
+        if (JsonSchemaProxyHandler.isObject(nextSchema)) {
+            JsonSchemaProxyHandler.validate(value, nextSchema);
         }
     }
 
-- 
cgit v1.2.3


From fca5c7515160bcae84fd3dc3284ec54babe75c72 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 10:35:41 -0500
Subject: Fix ifSchema

---
 ext/bg/js/json-schema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 97429211..43ba0c1d 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -204,7 +204,7 @@ class JsonSchemaProxyHandler {
 
         let okay = true;
         try {
-            JsonSchemaProxyHandler.validate(value, thenSchema);
+            JsonSchemaProxyHandler.validate(value, ifSchema, info);
         } catch (e) {
             okay = false;
         }
-- 
cgit v1.2.3


From 3bef380e3be0a641ec5095ef73ddb5c8d48a342c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 10:47:30 -0500
Subject: Add improved error information when validation fails

---
 ext/bg/js/json-schema.js | 165 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 114 insertions(+), 51 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 43ba0c1d..49f1e082 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -93,7 +93,7 @@ class JsonSchemaProxyHandler {
 
         value = JsonSchema.isolate(value);
 
-        JsonSchemaProxyHandler.validate(value, propertySchema);
+        JsonSchemaProxyHandler.validate(value, propertySchema, new JsonSchemaTraversalInfo(value, propertySchema));
 
         target[property] = value;
         return true;
@@ -189,206 +189,244 @@ class JsonSchemaProxyHandler {
         return type;
     }
 
-    static validate(value, schema) {
-        JsonSchemaProxyHandler.validateSingleSchema(value, schema);
-        JsonSchemaProxyHandler.validateConditional(value, schema);
-        JsonSchemaProxyHandler.validateAllOf(value, schema);
-        JsonSchemaProxyHandler.validateAnyOf(value, schema);
-        JsonSchemaProxyHandler.validateOneOf(value, schema);
-        JsonSchemaProxyHandler.validateNoneOf(value, schema);
+    static validate(value, schema, info) {
+        JsonSchemaProxyHandler.validateSingleSchema(value, schema, info);
+        JsonSchemaProxyHandler.validateConditional(value, schema, info);
+        JsonSchemaProxyHandler.validateAllOf(value, schema, info);
+        JsonSchemaProxyHandler.validateAnyOf(value, schema, info);
+        JsonSchemaProxyHandler.validateOneOf(value, schema, info);
+        JsonSchemaProxyHandler.validateNoneOf(value, schema, info);
     }
 
-    static validateConditional(value, schema) {
+    static validateConditional(value, schema, info) {
         const ifSchema = schema.if;
         if (!JsonSchemaProxyHandler.isObject(ifSchema)) { return; }
 
         let okay = true;
+        info.schemaPush('if', ifSchema);
         try {
             JsonSchemaProxyHandler.validate(value, ifSchema, info);
         } catch (e) {
             okay = false;
         }
+        info.schemaPop();
 
         const nextSchema = okay ? schema.then : schema.else;
         if (JsonSchemaProxyHandler.isObject(nextSchema)) {
-            JsonSchemaProxyHandler.validate(value, nextSchema);
+            info.schemaPush(okay ? 'then' : 'else', nextSchema);
+            JsonSchemaProxyHandler.validate(value, nextSchema, info);
+            info.schemaPop();
         }
     }
 
-    static validateAllOf(value, schema) {
+    static validateAllOf(value, schema, info) {
         const subSchemas = schema.allOf;
         if (!Array.isArray(subSchemas)) { return; }
 
+        info.schemaPush('allOf', subSchemas);
         for (let i = 0; i < subSchemas.length; ++i) {
-            JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+            const subSchema = subSchemas[i];
+            info.schemaPush(i, subSchema);
+            JsonSchemaProxyHandler.validate(value, subSchema, info);
+            info.schemaPop();
         }
+        info.schemaPop();
     }
 
-    static validateAnyOf(value, schema) {
+    static validateAnyOf(value, schema, info) {
         const subSchemas = schema.anyOf;
         if (!Array.isArray(subSchemas)) { return; }
 
+        info.schemaPush('anyOf', subSchemas);
         for (let i = 0; i < subSchemas.length; ++i) {
+            const subSchema = subSchemas[i];
+            info.schemaPush(i, subSchema);
             try {
-                JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+                JsonSchemaProxyHandler.validate(value, subSchema, info);
                 return;
             } catch (e) {
                 // NOP
             }
+            info.schemaPop();
         }
 
-        throw new JsonSchemaValidationError('0 anyOf schemas matched', value, schema);
+        throw new JsonSchemaValidationError('0 anyOf schemas matched', value, schema, info);
+        // info.schemaPop(); // Unreachable
     }
 
-    static validateOneOf(value, schema) {
+    static validateOneOf(value, schema, info) {
         const subSchemas = schema.oneOf;
         if (!Array.isArray(subSchemas)) { return; }
 
+        info.schemaPush('oneOf', subSchemas);
         let count = 0;
         for (let i = 0; i < subSchemas.length; ++i) {
+            const subSchema = subSchemas[i];
+            info.schemaPush(i, subSchema);
             try {
-                JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+                JsonSchemaProxyHandler.validate(value, subSchema, info);
                 ++count;
             } catch (e) {
                 // NOP
             }
+            info.schemaPop();
         }
 
         if (count !== 1) {
-            throw new JsonSchemaValidationError(`${count} oneOf schemas matched`, value, schema);
+            throw new JsonSchemaValidationError(`${count} oneOf schemas matched`, value, schema, info);
         }
+
+        info.schemaPop();
     }
 
-    static validateNoneOf(value, schema) {
+    static validateNoneOf(value, schema, info) {
         const subSchemas = schema.not;
         if (!Array.isArray(subSchemas)) { return; }
 
+        info.schemaPush('not', subSchemas);
         for (let i = 0; i < subSchemas.length; ++i) {
+            const subSchema = subSchemas[i];
+            info.schemaPush(i, subSchema);
             try {
-                JsonSchemaProxyHandler.validate(value, subSchemas[i]);
+                JsonSchemaProxyHandler.validate(value, subSchema, info);
             } catch (e) {
+                info.schemaPop();
                 continue;
             }
-            throw new JsonSchemaValidationError(`not[${i}] schema matched`, value, schema);
+            throw new JsonSchemaValidationError(`not[${i}] schema matched`, value, schema, info);
         }
+        info.schemaPop();
     }
 
-    static validateSingleSchema(value, schema) {
+    static validateSingleSchema(value, schema, info) {
         const type = JsonSchemaProxyHandler.getValueType(value);
         const schemaType = schema.type;
         if (!JsonSchemaProxyHandler.isValueTypeAny(value, type, schemaType)) {
-            throw new JsonSchemaValidationError(`Value type ${type} does not match schema type ${schemaType}`, value, schema);
+            throw new JsonSchemaValidationError(`Value type ${type} does not match schema type ${schemaType}`, value, schema, info);
         }
 
         const schemaEnum = schema.enum;
         if (Array.isArray(schemaEnum) && !JsonSchemaProxyHandler.valuesAreEqualAny(value, schemaEnum)) {
-            throw new JsonSchemaValidationError('Invalid enum value', value, schema);
+            throw new JsonSchemaValidationError('Invalid enum value', value, schema, info);
         }
 
         switch (type) {
             case 'number':
-                JsonSchemaProxyHandler.validateNumber(value, schema);
+                JsonSchemaProxyHandler.validateNumber(value, schema, info);
                 break;
             case 'string':
-                JsonSchemaProxyHandler.validateString(value, schema);
+                JsonSchemaProxyHandler.validateString(value, schema, info);
                 break;
             case 'array':
-                JsonSchemaProxyHandler.validateArray(value, schema);
+                JsonSchemaProxyHandler.validateArray(value, schema, info);
                 break;
             case 'object':
-                JsonSchemaProxyHandler.validateObject(value, schema);
+                JsonSchemaProxyHandler.validateObject(value, schema, info);
                 break;
         }
     }
 
-    static validateNumber(value, schema) {
+    static validateNumber(value, schema, info) {
         const multipleOf = schema.multipleOf;
         if (typeof multipleOf === 'number' && Math.floor(value / multipleOf) * multipleOf !== value) {
-            throw new JsonSchemaValidationError(`Number is not a multiple of ${multipleOf}`, value, schema);
+            throw new JsonSchemaValidationError(`Number is not a multiple of ${multipleOf}`, value, schema, info);
         }
 
         const minimum = schema.minimum;
         if (typeof minimum === 'number' && value < minimum) {
-            throw new JsonSchemaValidationError(`Number is less than ${minimum}`, value, schema);
+            throw new JsonSchemaValidationError(`Number is less than ${minimum}`, value, schema, info);
         }
 
         const exclusiveMinimum = schema.exclusiveMinimum;
         if (typeof exclusiveMinimum === 'number' && value <= exclusiveMinimum) {
-            throw new JsonSchemaValidationError(`Number is less than or equal to ${exclusiveMinimum}`, value, schema);
+            throw new JsonSchemaValidationError(`Number is less than or equal to ${exclusiveMinimum}`, value, schema, info);
         }
 
         const maximum = schema.maximum;
         if (typeof maximum === 'number' && value > maximum) {
-            throw new JsonSchemaValidationError(`Number is greater than ${maximum}`, value, schema);
+            throw new JsonSchemaValidationError(`Number is greater than ${maximum}`, value, schema, info);
         }
 
         const exclusiveMaximum = schema.exclusiveMaximum;
         if (typeof exclusiveMaximum === 'number' && value >= exclusiveMaximum) {
-            throw new JsonSchemaValidationError(`Number is greater than or equal to ${exclusiveMaximum}`, value, schema);
+            throw new JsonSchemaValidationError(`Number is greater than or equal to ${exclusiveMaximum}`, value, schema, info);
         }
     }
 
-    static validateString(value, schema) {
+    static validateString(value, schema, info) {
         const minLength = schema.minLength;
         if (typeof minLength === 'number' && value.length < minLength) {
-            throw new JsonSchemaValidationError('String length too short', value, schema);
+            throw new JsonSchemaValidationError('String length too short', value, schema, info);
         }
 
         const maxLength = schema.maxLength;
         if (typeof maxLength === 'number' && value.length > maxLength) {
-            throw new JsonSchemaValidationError('String length too long', value, schema);
+            throw new JsonSchemaValidationError('String length too long', value, schema, info);
         }
     }
 
-    static validateArray(value, schema) {
+    static validateArray(value, schema, info) {
         const minItems = schema.minItems;
         if (typeof minItems === 'number' && value.length < minItems) {
-            throw new JsonSchemaValidationError('Array length too short', value, schema);
+            throw new JsonSchemaValidationError('Array length too short', value, schema, info);
         }
 
         const maxItems = schema.maxItems;
         if (typeof maxItems === 'number' && value.length > maxItems) {
-            throw new JsonSchemaValidationError('Array length too long', value, schema);
+            throw new JsonSchemaValidationError('Array length too long', value, schema, info);
         }
 
         for (let i = 0, ii = value.length; i < ii; ++i) {
             const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value);
             if (propertySchema === null) {
-                throw new JsonSchemaValidationError(`No schema found for array[${i}]`, value, schema);
+                throw new JsonSchemaValidationError(`No schema found for array[${i}]`, value, schema, info);
             }
 
-            JsonSchemaProxyHandler.validate(value[i], propertySchema);
+            const propertyValue = value[i];
+
+            info.valuePush(i, propertyValue);
+            info.schemaPush(i, propertySchema);
+            JsonSchemaProxyHandler.validate(propertyValue, propertySchema, info);
+            info.schemaPop();
+            info.valuePop();
         }
     }
 
-    static validateObject(value, schema) {
+    static validateObject(value, schema, info) {
         const properties = new Set(Object.getOwnPropertyNames(value));
 
         const required = schema.required;
         if (Array.isArray(required)) {
             for (const property of required) {
                 if (!properties.has(property)) {
-                    throw new JsonSchemaValidationError(`Missing property ${property}`, value, schema);
+                    throw new JsonSchemaValidationError(`Missing property ${property}`, value, schema, info);
                 }
             }
         }
 
         const minProperties = schema.minProperties;
         if (typeof minProperties === 'number' && properties.length < minProperties) {
-            throw new JsonSchemaValidationError('Not enough object properties', value, schema);
+            throw new JsonSchemaValidationError('Not enough object properties', value, schema, info);
         }
 
         const maxProperties = schema.maxProperties;
         if (typeof maxProperties === 'number' && properties.length > maxProperties) {
-            throw new JsonSchemaValidationError('Too many object properties', value, schema);
+            throw new JsonSchemaValidationError('Too many object properties', value, schema, info);
         }
 
         for (const property of properties) {
             const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value);
             if (propertySchema === null) {
-                throw new JsonSchemaValidationError(`No schema found for ${property}`, value, schema);
+                throw new JsonSchemaValidationError(`No schema found for ${property}`, value, schema, info);
             }
-            JsonSchemaProxyHandler.validate(value[property], propertySchema);
+
+            const propertyValue = value[property];
+
+            info.valuePush(property, propertyValue);
+            info.schemaPush(property, propertySchema);
+            JsonSchemaProxyHandler.validate(propertyValue, propertySchema, info);
+            info.schemaPop();
+            info.valuePop();
         }
     }
 
@@ -530,12 +568,37 @@ class JsonSchemaProxyHandler {
 
 JsonSchemaProxyHandler._unconstrainedSchema = {};
 
+class JsonSchemaTraversalInfo {
+    constructor(value, schema) {
+        this.valuePath = [];
+        this.schemaPath = [];
+        this.valuePush([null, value]);
+        this.schemaPush([null, schema]);
+    }
+
+    valuePush(path, value) {
+        this.valuePath.push([path, value]);
+    }
+
+    valuePop() {
+        this.valuePath.pop();
+    }
+
+    schemaPush(path, schema) {
+        this.schemaPath.push([path, schema]);
+    }
+
+    schemaPop() {
+        this.schemaPath.pop();
+    }
+}
+
 class JsonSchemaValidationError extends Error {
-    constructor(message, value, schema, path) {
+    constructor(message, value, schema, info) {
         super(message);
         this.value = value;
         this.schema = schema;
-        this.path = path;
+        this.info = info;
     }
 }
 
@@ -545,7 +608,7 @@ class JsonSchema {
     }
 
     static validate(value, schema) {
-        return JsonSchemaProxyHandler.validate(value, schema);
+        return JsonSchemaProxyHandler.validate(value, schema, new JsonSchemaTraversalInfo(value, schema));
     }
 
     static getValidValueOrDefault(schema, value) {
-- 
cgit v1.2.3


From ea808024d70e95b94dca7f846e7910573fed8466 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 11:04:38 -0500
Subject: Fix missing else

---
 ext/bg/js/json-schema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 49f1e082..0ca1183e 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -134,7 +134,7 @@ class JsonSchemaProxyHandler {
                 const additionalProperties = schema.additionalProperties;
                 if (additionalProperties === false) {
                     return null;
-                } if (JsonSchemaProxyHandler.isObject(additionalProperties)) {
+                } else if (JsonSchemaProxyHandler.isObject(additionalProperties)) {
                     return additionalProperties;
                 } else {
                     return JsonSchemaProxyHandler._unconstrainedSchema;
-- 
cgit v1.2.3


From b1fc9c024ae84ed603d7f7bec54fadc73a39f1b8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 11:13:26 -0500
Subject: Update how property schemas are returned

---
 ext/bg/js/json-schema.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 0ca1183e..8db5411c 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -126,8 +126,9 @@ class JsonSchemaProxyHandler {
             {
                 const properties = schema.properties;
                 if (JsonSchemaProxyHandler.isObject(properties)) {
-                    if (Object.prototype.hasOwnProperty.call(properties, property)) {
-                        return properties[property];
+                    const propertySchema = properties[property];
+                    if (JsonSchemaProxyHandler.isObject(propertySchema)) {
+                        return propertySchema;
                     }
                 }
 
@@ -148,7 +149,10 @@ class JsonSchemaProxyHandler {
                 }
                 if (Array.isArray(items)) {
                     if (property >= 0 && property < items.length) {
-                        return items[property];
+                        const propertySchema = items[property];
+                        if (JsonSchemaProxyHandler.isObject(propertySchema)) {
+                            return propertySchema;
+                        }
                     }
                 }
 
-- 
cgit v1.2.3


From fff1e67a5e52cb104c77069903f975e114d7a835 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 11:18:13 -0500
Subject: Improve schema path when using getPropertySchema

---
 ext/bg/js/json-schema.js | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 8db5411c..ad6372df 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -119,7 +119,7 @@ class JsonSchemaProxyHandler {
         throw new Error('construct not supported');
     }
 
-    static getPropertySchema(schema, property, value) {
+    static getPropertySchema(schema, property, value, path=null) {
         const type = JsonSchemaProxyHandler.getSchemaOrValueType(schema, value);
         switch (type) {
             case 'object':
@@ -128,6 +128,7 @@ class JsonSchemaProxyHandler {
                 if (JsonSchemaProxyHandler.isObject(properties)) {
                     const propertySchema = properties[property];
                     if (JsonSchemaProxyHandler.isObject(propertySchema)) {
+                        if (path !== null) { path.push(['properties', properties], [property, propertySchema]); }
                         return propertySchema;
                     }
                 }
@@ -136,9 +137,12 @@ class JsonSchemaProxyHandler {
                 if (additionalProperties === false) {
                     return null;
                 } else if (JsonSchemaProxyHandler.isObject(additionalProperties)) {
+                    if (path !== null) { path.push(['additionalProperties', additionalProperties]); }
                     return additionalProperties;
                 } else {
-                    return JsonSchemaProxyHandler._unconstrainedSchema;
+                    const result = JsonSchemaProxyHandler._unconstrainedSchema;
+                    if (path !== null) { path.push([null, result]); }
+                    return result;
                 }
             }
             case 'array':
@@ -151,6 +155,7 @@ class JsonSchemaProxyHandler {
                     if (property >= 0 && property < items.length) {
                         const propertySchema = items[property];
                         if (JsonSchemaProxyHandler.isObject(propertySchema)) {
+                            if (path !== null) { path.push(['items', items], [property, propertySchema]); }
                             return propertySchema;
                         }
                     }
@@ -160,9 +165,12 @@ class JsonSchemaProxyHandler {
                 if (additionalItems === false) {
                     return null;
                 } else if (JsonSchemaProxyHandler.isObject(additionalItems)) {
+                    if (path !== null) { path.push(['additionalItems', additionalItems]); }
                     return additionalItems;
                 } else {
-                    return JsonSchemaProxyHandler._unconstrainedSchema;
+                    const result = JsonSchemaProxyHandler._unconstrainedSchema;
+                    if (path !== null) { path.push([null, result]); }
+                    return result;
                 }
             }
             default:
@@ -381,18 +389,19 @@ class JsonSchemaProxyHandler {
         }
 
         for (let i = 0, ii = value.length; i < ii; ++i) {
-            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value);
+            const schemaPath = [];
+            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, i, value, schemaPath);
             if (propertySchema === null) {
                 throw new JsonSchemaValidationError(`No schema found for array[${i}]`, value, schema, info);
             }
 
             const propertyValue = value[i];
 
+            for (const [p, s] of schemaPath) { info.schemaPush(p, s); }
             info.valuePush(i, propertyValue);
-            info.schemaPush(i, propertySchema);
             JsonSchemaProxyHandler.validate(propertyValue, propertySchema, info);
-            info.schemaPop();
             info.valuePop();
+            for (let i = 0; i < schemaPath.length; ++i) { info.schemaPop(); }
         }
     }
 
@@ -419,18 +428,19 @@ class JsonSchemaProxyHandler {
         }
 
         for (const property of properties) {
-            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value);
+            const schemaPath = [];
+            const propertySchema = JsonSchemaProxyHandler.getPropertySchema(schema, property, value, schemaPath);
             if (propertySchema === null) {
                 throw new JsonSchemaValidationError(`No schema found for ${property}`, value, schema, info);
             }
 
             const propertyValue = value[property];
 
+            for (const [p, s] of schemaPath) { info.schemaPush(p, s); }
             info.valuePush(property, propertyValue);
-            info.schemaPush(property, propertySchema);
             JsonSchemaProxyHandler.validate(propertyValue, propertySchema, info);
-            info.schemaPop();
             info.valuePop();
+            for (let i = 0; i < schemaPath.length; ++i) { info.schemaPop(); }
         }
     }
 
-- 
cgit v1.2.3


From 3c28c7dd7cdbf4af91b0b4044f03e0877569e3b8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 11:22:22 -0500
Subject: Fix init

---
 ext/bg/js/json-schema.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index ad6372df..3cf24c35 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -586,8 +586,8 @@ class JsonSchemaTraversalInfo {
     constructor(value, schema) {
         this.valuePath = [];
         this.schemaPath = [];
-        this.valuePush([null, value]);
-        this.schemaPush([null, schema]);
+        this.valuePush(null, value);
+        this.schemaPush(null, schema);
     }
 
     valuePush(path, value) {
-- 
cgit v1.2.3


From e8701cb950edd4c90f6c911e340db3af32194113 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 2 Feb 2020 14:53:32 -0500
Subject: Hide anki-invalid-response-error when there is no error

---
 ext/bg/js/settings/anki.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki.js
index 3b0912d4..f55989fc 100644
--- a/ext/bg/js/settings/anki.js
+++ b/ext/bg/js/settings/anki.js
@@ -33,20 +33,27 @@ function _ankiSpinnerShow(show) {
 
 function _ankiSetError(error) {
     const node = document.querySelector('#anki-error');
-    if (!node) { return; }
+    const node2 = document.querySelector('#anki-invalid-response-error');
     if (error) {
         const errorString = `${error}`;
-        node.hidden = false;
-        node.textContent = errorString;
-        _ankiSetErrorData(node, error);
+        if (node !== null) {
+            node.hidden = false;
+            node.textContent = errorString;
+            _ankiSetErrorData(node, error);
+        }
 
-        const node2 = document.querySelector('#anki-invalid-response-error');
         if (node2 !== null) {
             node2.hidden = (errorString.indexOf('Invalid response') < 0);
         }
     } else {
-        node.hidden = true;
-        node.textContent = '';
+        if (node !== null) {
+            node.hidden = true;
+            node.textContent = '';
+        }
+
+        if (node2 !== null) {
+            node2.hidden = true;
+        }
     }
 }
 
-- 
cgit v1.2.3


From 8eac191c97b755d7b090a46055b183750e6faa45 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Wed, 5 Feb 2020 14:19:48 +0200
Subject: prevent unwanted wheel events on history bar

---
 ext/mixed/js/display.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 54cda0eb..a6cfe848 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -221,13 +221,16 @@ class Display {
     }
 
     onHistoryWheel(e) {
+        if (e.altKey) { return; }
         const delta = -e.deltaX || e.deltaY;
         if (delta > 0) {
             this.sourceTermView();
             e.preventDefault();
+            e.stopPropagation();
         } else if (delta < 0) {
             this.nextTermView();
             e.preventDefault();
+            e.stopPropagation();
         }
     }
 
-- 
cgit v1.2.3


From 4b17e79cb82c7c4348ada090f95ea484effe36c2 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 26 Jan 2020 15:06:42 -0500
Subject: Add schemas for dictionary data

---
 ext/bg/data/dictionary-index-schema.json           | 40 ++++++++++++++++++
 ext/bg/data/dictionary-kanji-bank-v1-schema.json   | 33 +++++++++++++++
 ext/bg/data/dictionary-kanji-bank-v3-schema.json   | 44 ++++++++++++++++++++
 .../data/dictionary-kanji-meta-bank-v3-schema.json | 25 +++++++++++
 ext/bg/data/dictionary-tag-bank-v3-schema.json     | 32 +++++++++++++++
 ext/bg/data/dictionary-term-bank-v1-schema.json    | 36 ++++++++++++++++
 ext/bg/data/dictionary-term-bank-v3-schema.json    | 48 ++++++++++++++++++++++
 .../data/dictionary-term-meta-bank-v3-schema.json  | 25 +++++++++++
 8 files changed, 283 insertions(+)
 create mode 100644 ext/bg/data/dictionary-index-schema.json
 create mode 100644 ext/bg/data/dictionary-kanji-bank-v1-schema.json
 create mode 100644 ext/bg/data/dictionary-kanji-bank-v3-schema.json
 create mode 100644 ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json
 create mode 100644 ext/bg/data/dictionary-tag-bank-v3-schema.json
 create mode 100644 ext/bg/data/dictionary-term-bank-v1-schema.json
 create mode 100644 ext/bg/data/dictionary-term-bank-v3-schema.json
 create mode 100644 ext/bg/data/dictionary-term-meta-bank-v3-schema.json

diff --git a/ext/bg/data/dictionary-index-schema.json b/ext/bg/data/dictionary-index-schema.json
new file mode 100644
index 00000000..9865fcc1
--- /dev/null
+++ b/ext/bg/data/dictionary-index-schema.json
@@ -0,0 +1,40 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "description": "Index file containing information about the data contained in the dictionary.",
+    "required": [
+        "title",
+        "revision"
+    ],
+    "properties": {
+        "title": {
+            "type": "string",
+            "description": "Title of the dictionary."
+        },
+        "revision": {
+            "type": "string",
+            "description": "Revision of the dictionary. This value is only used for displaying information."
+        },
+        "sequenced": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether or not this dictionary can be used as the primary dictionary. Primary dictionaries typically contain term/expression definitions."
+        },
+        "format": {
+            "type": "integer",
+            "description": "Format of data found in the JSON data files."
+        },
+        "version": {
+            "type": "integer",
+            "description": "Alias for format."
+        }
+    },
+    "anyOf": [
+        {
+            "required": ["format"]
+        },
+        {
+            "required": ["version"]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-kanji-bank-v1-schema.json b/ext/bg/data/dictionary-kanji-bank-v1-schema.json
new file mode 100644
index 00000000..6dad5a7a
--- /dev/null
+++ b/ext/bg/data/dictionary-kanji-bank-v1-schema.json
@@ -0,0 +1,33 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Data file containing kanji information.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Information about a single kanji character.",
+        "minItems": 4,
+        "items": [
+            {
+                "type": "string",
+                "description": "Kanji character.",
+                "minLength": 1
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated onyomi readings for the kanji character. An empty string is treated as no readings."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated kunyomi readings for the kanji character. An empty string is treated as no readings."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated tags for the kanji character. An empty string is treated as no tags."
+            }
+        ],
+        "additionalItems": {
+            "type": "string",
+            "description": "A meaning for the kanji character."
+        }
+    }
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-kanji-bank-v3-schema.json b/ext/bg/data/dictionary-kanji-bank-v3-schema.json
new file mode 100644
index 00000000..a5b82039
--- /dev/null
+++ b/ext/bg/data/dictionary-kanji-bank-v3-schema.json
@@ -0,0 +1,44 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Data file containing kanji information.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Information about a single kanji character.",
+        "minItems": 6,
+        "items": [
+            {
+                "type": "string",
+                "description": "Kanji character.",
+                "minLength": 1
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated onyomi readings for the kanji character. An empty string is treated as no readings."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated kunyomi readings for the kanji character. An empty string is treated as no readings."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated tags for the kanji character. An empty string is treated as no tags."
+            },
+            {
+                "type": "array",
+                "description": "Array of meanings for the kanji character.",
+                "items": {
+                    "type": "string",
+                    "description": "A meaning for the kanji character."
+                }
+            },
+            {
+                "type": "object",
+                "description": "Various stats for the kanji character.",
+                "additionalProperties": {
+                    "type": "string"
+                }
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json b/ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json
new file mode 100644
index 00000000..62479026
--- /dev/null
+++ b/ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json
@@ -0,0 +1,25 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Custom metadata for kanji characters.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Metadata about a single kanji character.",
+        "minItems": 3,
+        "items": [
+            {
+                "type": "string",
+                "minLength": 1
+            },
+            {
+                "type": "string",
+                "enum": ["freq"],
+                "description": "Type of data. \"freq\" corresponds to frequency information."
+            },
+            {
+                "type": ["string", "number"],
+                "description": "Data for the character."
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-tag-bank-v3-schema.json b/ext/bg/data/dictionary-tag-bank-v3-schema.json
new file mode 100644
index 00000000..ee5ca64d
--- /dev/null
+++ b/ext/bg/data/dictionary-tag-bank-v3-schema.json
@@ -0,0 +1,32 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Data file containing tag information for terms and kanji.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Information about a single tag.",
+        "minItems": 5,
+        "items": [
+            {
+                "type": "string",
+                "description": "Tag name."
+            },
+            {
+                "type": "string",
+                "description": "Category for the tag."
+            },
+            {
+                "type": "number",
+                "description": "Sorting order for the tag."
+            },
+            {
+                "type": "string",
+                "description": "Notes for the tag."
+            },
+            {
+                "type": "number",
+                "description": "Score used to determine popularity. Negative values are more rare and positive values are more frequent. This score is also used to sort search results."
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-term-bank-v1-schema.json b/ext/bg/data/dictionary-term-bank-v1-schema.json
new file mode 100644
index 00000000..6ffb26e6
--- /dev/null
+++ b/ext/bg/data/dictionary-term-bank-v1-schema.json
@@ -0,0 +1,36 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Data file containing term and expression information.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Information about a single term/expression.",
+        "minItems": 5,
+        "items": [
+            {
+                "type": "string",
+                "description": "Term or expression."
+            },
+            {
+                "type": "string",
+                "description": "Reading of the term/expression, or an empty string if the reading is the same as the term/expression."
+            },
+            {
+                "type": ["string", "null"],
+                "description": "String of space-separated tags for the definition. An empty string is treated as no tags."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated rule identifiers for the definition which is used to validate delinflection. Valid rule identifiers are: v1: ichidan verb; v5: godan verb; vs: suru verb; vk: kuru verb; adj-i: i-adjective. An empty string corresponds to words which aren't inflected, such as nouns."
+            },
+            {
+                "type": "number",
+                "description": "Score used to determine popularity. Negative values are more rare and positive values are more frequent. This score is also used to sort search results."
+            }
+        ],
+        "additionalItems": {
+            "type": "string",
+            "description": "Single definition for the term/expression."
+        }
+    }
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-term-bank-v3-schema.json b/ext/bg/data/dictionary-term-bank-v3-schema.json
new file mode 100644
index 00000000..bb982e36
--- /dev/null
+++ b/ext/bg/data/dictionary-term-bank-v3-schema.json
@@ -0,0 +1,48 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Data file containing term and expression information.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Information about a single term/expression.",
+        "minItems": 8,
+        "items": [
+            {
+                "type": "string",
+                "description": "Term or expression."
+            },
+            {
+                "type": "string",
+                "description": "Reading of the term/expression, or an empty string if the reading is the same as the term/expression."
+            },
+            {
+                "type": ["string", "null"],
+                "description": "String of space-separated tags for the definition. An empty string is treated as no tags."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated rule identifiers for the definition which is used to validate delinflection. Valid rule identifiers are: v1: ichidan verb; v5: godan verb; vs: suru verb; vk: kuru verb; adj-i: i-adjective. An empty string corresponds to words which aren't inflected, such as nouns."
+            },
+            {
+                "type": "number",
+                "description": "Score used to determine popularity. Negative values are more rare and positive values are more frequent. This score is also used to sort search results."
+            },
+            {
+                "type": "array",
+                "description": "Array of definitions for the term/expression.",
+                "items": {
+                    "type": "string",
+                    "description": "Single definition for the term/expression."
+                }
+            },
+            {
+                "type": "integer",
+                "description": "Sequence number for the term/expression. Terms/expressions with the same sequence number can be shown together when the \"resultOutputMode\" option is set to \"merge\"."
+            },
+            {
+                "type": "string",
+                "description": "String of space-separated tags for the term/expression. An empty string is treated as no tags."
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/ext/bg/data/dictionary-term-meta-bank-v3-schema.json b/ext/bg/data/dictionary-term-meta-bank-v3-schema.json
new file mode 100644
index 00000000..1cc0557f
--- /dev/null
+++ b/ext/bg/data/dictionary-term-meta-bank-v3-schema.json
@@ -0,0 +1,25 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "array",
+    "description": "Custom metadata for terms/expressions.",
+    "additionalItems": {
+        "type": "array",
+        "description": "Metadata about a single term/expression.",
+        "minItems": 3,
+        "items": [
+            {
+                "type": "string",
+                "description": "Term or expression."
+            },
+            {
+                "type": "string",
+                "enum": ["freq"],
+                "description": "Type of data. \"freq\" corresponds to frequency information."
+            },
+            {
+                "type": ["string", "number"],
+                "description": "Data for the term/expression."
+            }
+        ]
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 8733e324ecbe10bcb4bc9f1a0b9568c7f32429d3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 22:41:02 -0500
Subject: Create script to validate dictionary files

---
 test/dictionary-validate.js | 90 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 test/dictionary-validate.js

diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
new file mode 100644
index 00000000..971c4971
--- /dev/null
+++ b/test/dictionary-validate.js
@@ -0,0 +1,90 @@
+const fs = require('fs');
+const path = require('path');
+
+process.noDeprecation = true; // Suppress a warning about JSZip
+const JSZip = require(path.join(__dirname, '../ext/mixed/lib/jszip.min.js'));
+process.noDeprecation = false;
+
+const jsonSchemaFileName = path.join(__dirname, '../ext/bg/js/json-schema.js');
+const jsonSchemaFileSource = fs.readFileSync(jsonSchemaFileName, {encoding: 'utf8'});
+const JsonSchema = Function(`'use strict';${jsonSchemaFileSource};return JsonSchema;`)();
+
+
+function readSchema(relativeFileName) {
+    const fileName = path.join(__dirname, relativeFileName);
+    const source = fs.readFileSync(fileName, {encoding: 'utf8'});
+    return JSON.parse(source);
+}
+
+
+async function validateDictionaryBanks(zip, fileNameFormat, schema) {
+    let index = 1;
+    while (true) {
+        const fileName = fileNameFormat.replace(/%s/, index);
+
+        const file = zip.files[fileName];
+        if (!file) { break; }
+
+        const data = JSON.parse(await file.async('string'));
+        JsonSchema.validate(data, schema);
+
+        ++index;
+    }
+}
+
+async function validateDictionary(fileName, schemas) {
+    const source = fs.readFileSync(fileName);
+    const zip = await JSZip.loadAsync(source);
+
+    const indexFile = zip.files['index.json'];
+    if (!indexFile) {
+        throw new Error('No dictionary index found in archive');
+    }
+
+    const index = JSON.parse(await indexFile.async('string'));
+    const version = index.format || index.version;
+
+    JsonSchema.validate(index, schemas.index);
+
+    await validateDictionaryBanks(zip, 'term_bank_%s.json', version === 1 ? schemas.termBankV1 : schemas.termBankV3);
+    await validateDictionaryBanks(zip, 'term_meta_bank_%s.json', schemas.termMetaBankV3);
+    await validateDictionaryBanks(zip, 'kanji_bank_%s.json', version === 1 ? schemas.kanjiBankV1 : schemas.kanjiBankV3);
+    await validateDictionaryBanks(zip, 'kanji_meta_bank_%s.json', schemas.kanjiMetaBankV3);
+    await validateDictionaryBanks(zip, 'tag_bank_%s.json', schemas.tagBankV3);
+}
+
+
+async function main() {
+    const dictionaryFileNames = process.argv.slice(2);
+    if (dictionaryFileNames.length === 0) {
+        console.log([
+            'Usage:',
+            '  node dictionary-validate <dictionary-file-names>...'
+        ].join('\n'));
+        return;
+    }
+
+    const schemas = {
+        index: readSchema('../ext/bg/data/dictionary-index-schema.json'),
+        kanjiBankV1: readSchema('../ext/bg/data/dictionary-kanji-bank-v1-schema.json'),
+        kanjiBankV3: readSchema('../ext/bg/data/dictionary-kanji-bank-v3-schema.json'),
+        kanjiMetaBankV3: readSchema('../ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json'),
+        tagBankV3: readSchema('../ext/bg/data/dictionary-tag-bank-v3-schema.json'),
+        termBankV1: readSchema('../ext/bg/data/dictionary-term-bank-v1-schema.json'),
+        termBankV3: readSchema('../ext/bg/data/dictionary-term-bank-v3-schema.json'),
+        termMetaBankV3: readSchema('../ext/bg/data/dictionary-term-meta-bank-v3-schema.json')
+    };
+
+    for (const dictionaryFileName of dictionaryFileNames) {
+        try {
+            console.log(`Validating ${dictionaryFileName}...`);
+            await validateDictionary(dictionaryFileName, schemas);
+            console.log('No issues found');
+        } catch (e) {
+            console.warn(e);
+        }
+    }
+}
+
+
+main();
-- 
cgit v1.2.3


From 23ddf84c6dd38479e3bedd8c9fac3fbc18885722 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 8 Feb 2020 13:14:30 -0500
Subject: Add script for testing generic schemas

---
 test/schema-validate.js | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 test/schema-validate.js

diff --git a/test/schema-validate.js b/test/schema-validate.js
new file mode 100644
index 00000000..ac5a8a85
--- /dev/null
+++ b/test/schema-validate.js
@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+
+const jsonSchemaFileName = path.join(__dirname, '../ext/bg/js/json-schema.js');
+const jsonSchemaFileSource = fs.readFileSync(jsonSchemaFileName, {encoding: 'utf8'});
+const JsonSchema = Function(`'use strict';${jsonSchemaFileSource};return JsonSchema;`)();
+
+
+function main() {
+    const args = process.argv.slice(2);
+    if (args.length < 2) {
+        console.log([
+            'Usage:',
+            '  node schema-validate <schema-file-name> <data-file-names>...'
+        ].join('\n'));
+        return;
+    }
+
+    const schemaSource = fs.readFileSync(args[0], {encoding: 'utf8'});
+    const schema = JSON.parse(schemaSource);
+
+    for (const dataFileName of args.slice(1)) {
+        try {
+            console.log(`Validating ${dataFileName}...`);
+            const dataSource = fs.readFileSync(dataFileName, {encoding: 'utf8'});
+            const data = JSON.parse(dataSource);
+            JsonSchema.validate(data, schema);
+            console.log('No issues found');
+        } catch (e) {
+            console.warn(e);
+        }
+    }
+}
+
+
+main();
-- 
cgit v1.2.3


From 165959ef068905485a044a06bb281109d88d5679 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:45:30 -0500
Subject: Move japanese.js into bg

---
 ext/bg/background.html   |   2 +-
 ext/bg/js/japanese.js    | 454 +++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/search.html       |   2 +-
 ext/bg/settings.html     |   2 +-
 ext/mixed/js/japanese.js | 454 -----------------------------------------------
 5 files changed, 457 insertions(+), 457 deletions(-)
 create mode 100644 ext/bg/js/japanese.js
 delete mode 100644 ext/mixed/js/japanese.js

diff --git a/ext/bg/background.html b/ext/bg/background.html
index af87eddb..e6d32593 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -31,6 +31,7 @@
         <script src="/bg/js/deinflector.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/japanese.js"></script>
         <script src="/bg/js/json-schema.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/profile-conditions.js"></script>
@@ -39,7 +40,6 @@
         <script src="/bg/js/translator.js"></script>
         <script src="/bg/js/util.js"></script>
         <script src="/mixed/js/audio.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
 
         <script src="/bg/js/backend.js"></script>
     </body>
diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
new file mode 100644
index 00000000..0da822d7
--- /dev/null
+++ b/ext/bg/js/japanese.js
@@ -0,0 +1,454 @@
+/*
+ * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+const JP_HALFWIDTH_KATAKANA_MAPPING = new Map([
+    ['ｦ', 'ヲヺ-'],
+    ['ｧ', 'ァ--'],
+    ['ｨ', 'ィ--'],
+    ['ｩ', 'ゥ--'],
+    ['ｪ', 'ェ--'],
+    ['ｫ', 'ォ--'],
+    ['ｬ', 'ャ--'],
+    ['ｭ', 'ュ--'],
+    ['ｮ', 'ョ--'],
+    ['ｯ', 'ッ--'],
+    ['ｰ', 'ー--'],
+    ['ｱ', 'ア--'],
+    ['ｲ', 'イ--'],
+    ['ｳ', 'ウヴ-'],
+    ['ｴ', 'エ--'],
+    ['ｵ', 'オ--'],
+    ['ｶ', 'カガ-'],
+    ['ｷ', 'キギ-'],
+    ['ｸ', 'クグ-'],
+    ['ｹ', 'ケゲ-'],
+    ['ｺ', 'コゴ-'],
+    ['ｻ', 'サザ-'],
+    ['ｼ', 'シジ-'],
+    ['ｽ', 'スズ-'],
+    ['ｾ', 'セゼ-'],
+    ['ｿ', 'ソゾ-'],
+    ['ﾀ', 'タダ-'],
+    ['ﾁ', 'チヂ-'],
+    ['ﾂ', 'ツヅ-'],
+    ['ﾃ', 'テデ-'],
+    ['ﾄ', 'トド-'],
+    ['ﾅ', 'ナ--'],
+    ['ﾆ', 'ニ--'],
+    ['ﾇ', 'ヌ--'],
+    ['ﾈ', 'ネ--'],
+    ['ﾉ', 'ノ--'],
+    ['ﾊ', 'ハバパ'],
+    ['ﾋ', 'ヒビピ'],
+    ['ﾌ', 'フブプ'],
+    ['ﾍ', 'ヘベペ'],
+    ['ﾎ', 'ホボポ'],
+    ['ﾏ', 'マ--'],
+    ['ﾐ', 'ミ--'],
+    ['ﾑ', 'ム--'],
+    ['ﾒ', 'メ--'],
+    ['ﾓ', 'モ--'],
+    ['ﾔ', 'ヤ--'],
+    ['ﾕ', 'ユ--'],
+    ['ﾖ', 'ヨ--'],
+    ['ﾗ', 'ラ--'],
+    ['ﾘ', 'リ--'],
+    ['ﾙ', 'ル--'],
+    ['ﾚ', 'レ--'],
+    ['ﾛ', 'ロ--'],
+    ['ﾜ', 'ワ--'],
+    ['ﾝ', 'ン--']
+]);
+
+const JP_HIRAGANA_RANGE = [0x3040, 0x309f];
+const JP_KATAKANA_RANGE = [0x30a0, 0x30ff];
+const JP_KANA_RANGES = [JP_HIRAGANA_RANGE, JP_KATAKANA_RANGE];
+
+const JP_CJK_COMMON_RANGE = [0x4e00, 0x9fff];
+const JP_CJK_RARE_RANGE = [0x3400, 0x4dbf];
+const JP_CJK_RANGES = [JP_CJK_COMMON_RANGE, JP_CJK_RARE_RANGE];
+
+const JP_ITERATION_MARK_CHAR_CODE = 0x3005;
+
+// Japanese character ranges, roughly ordered in order of expected frequency
+const JP_JAPANESE_RANGES = [
+    JP_HIRAGANA_RANGE,
+    JP_KATAKANA_RANGE,
+
+    JP_CJK_COMMON_RANGE,
+    JP_CJK_RARE_RANGE,
+
+    [0xff66, 0xff9f], // Halfwidth katakana
+
+    [0x30fb, 0x30fc], // Katakana punctuation
+    [0xff61, 0xff65], // Kana punctuation
+    [0x3000, 0x303f], // CJK punctuation
+
+    [0xff10, 0xff19], // Fullwidth numbers
+    [0xff21, 0xff3a], // Fullwidth upper case Latin letters
+    [0xff41, 0xff5a], // Fullwidth lower case Latin letters
+
+    [0xff01, 0xff0f], // Fullwidth punctuation 1
+    [0xff1a, 0xff1f], // Fullwidth punctuation 2
+    [0xff3b, 0xff3f], // Fullwidth punctuation 3
+    [0xff5b, 0xff60], // Fullwidth punctuation 4
+    [0xffe0, 0xffee], // Currency markers
+];
+
+
+// Helper functions
+
+function _jpIsCharCodeInRanges(charCode, ranges) {
+    for (const [min, max] of ranges) {
+        if (charCode >= min && charCode <= max) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+// Character code testing functions
+
+function jpIsCharCodeKanji(charCode) {
+    return _jpIsCharCodeInRanges(charCode, JP_CJK_RANGES);
+}
+
+function jpIsCharCodeKana(charCode) {
+    return _jpIsCharCodeInRanges(charCode, JP_KANA_RANGES);
+}
+
+function jpIsCharCodeJapanese(charCode) {
+    return _jpIsCharCodeInRanges(charCode, JP_JAPANESE_RANGES);
+}
+
+
+// String testing functions
+
+function jpIsStringEntirelyKana(str) {
+    if (str.length === 0) { return false; }
+    for (let i = 0, ii = str.length; i < ii; ++i) {
+        if (!jpIsCharCodeKana(str.charCodeAt(i))) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function jpIsStringPartiallyJapanese(str) {
+    if (str.length === 0) { return false; }
+    for (let i = 0, ii = str.length; i < ii; ++i) {
+        if (jpIsCharCodeJapanese(str.charCodeAt(i))) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
+// Conversion functions
+
+function jpKatakanaToHiragana(text) {
+    let result = '';
+    for (const c of text) {
+        if (wanakana.isKatakana(c)) {
+            result += wanakana.toHiragana(c);
+        } else {
+            result += c;
+        }
+    }
+
+    return result;
+}
+
+function jpHiraganaToKatakana(text) {
+    let result = '';
+    for (const c of text) {
+        if (wanakana.isHiragana(c)) {
+            result += wanakana.toKatakana(c);
+        } else {
+            result += c;
+        }
+    }
+
+    return result;
+}
+
+function jpToRomaji(text) {
+    return wanakana.toRomaji(text);
+}
+
+function jpConvertReading(expressionFragment, readingFragment, readingMode) {
+    switch (readingMode) {
+        case 'hiragana':
+            return jpKatakanaToHiragana(readingFragment || '');
+        case 'katakana':
+            return jpHiraganaToKatakana(readingFragment || '');
+        case 'romaji':
+            if (readingFragment) {
+                return jpToRomaji(readingFragment);
+            } else {
+                if (jpIsStringEntirelyKana(expressionFragment)) {
+                    return jpToRomaji(expressionFragment);
+                }
+            }
+            return readingFragment;
+        case 'none':
+            return null;
+        default:
+            return readingFragment;
+    }
+}
+
+function jpDistributeFurigana(expression, reading) {
+    const fallback = [{furigana: reading, text: expression}];
+    if (!reading) {
+        return fallback;
+    }
+
+    let isAmbiguous = false;
+    const segmentize = (reading, groups) => {
+        if (groups.length === 0 || isAmbiguous) {
+            return [];
+        }
+
+        const group = groups[0];
+        if (group.mode === 'kana') {
+            if (jpKatakanaToHiragana(reading).startsWith(jpKatakanaToHiragana(group.text))) {
+                const readingLeft = reading.substring(group.text.length);
+                const segs = segmentize(readingLeft, groups.splice(1));
+                if (segs) {
+                    return [{text: group.text}].concat(segs);
+                }
+            }
+        } else {
+            let foundSegments = null;
+            for (let i = reading.length; i >= group.text.length; --i) {
+                const readingUsed = reading.substring(0, i);
+                const readingLeft = reading.substring(i);
+                const segs = segmentize(readingLeft, groups.slice(1));
+                if (segs) {
+                    if (foundSegments !== null) {
+                        // more than one way to segmentize the tail, mark as ambiguous
+                        isAmbiguous = true;
+                        return null;
+                    }
+                    foundSegments = [{text: group.text, furigana: readingUsed}].concat(segs);
+                }
+                // there is only one way to segmentize the last non-kana group
+                if (groups.length === 1) {
+                    break;
+                }
+            }
+            return foundSegments;
+        }
+    };
+
+    const groups = [];
+    let modePrev = null;
+    for (const c of expression) {
+        const charCode = c.charCodeAt(0);
+        const modeCurr = jpIsCharCodeKanji(charCode) || charCode === JP_ITERATION_MARK_CHAR_CODE ? 'kanji' : 'kana';
+        if (modeCurr === modePrev) {
+            groups[groups.length - 1].text += c;
+        } else {
+            groups.push({mode: modeCurr, text: c});
+            modePrev = modeCurr;
+        }
+    }
+
+    const segments = segmentize(reading, groups);
+    if (segments && !isAmbiguous) {
+        return segments;
+    }
+    return fallback;
+}
+
+function jpDistributeFuriganaInflected(expression, reading, source) {
+    const output = [];
+
+    let stemLength = 0;
+    const shortest = Math.min(source.length, expression.length);
+    const sourceHiragana = jpKatakanaToHiragana(source);
+    const expressionHiragana = jpKatakanaToHiragana(expression);
+    while (stemLength < shortest && sourceHiragana[stemLength] === expressionHiragana[stemLength]) {
+        ++stemLength;
+    }
+    const offset = source.length - stemLength;
+
+    const stemExpression = source.substring(0, source.length - offset);
+    const stemReading = reading.substring(
+        0,
+        offset === 0 ? reading.length : reading.length - expression.length + stemLength
+    );
+    for (const segment of jpDistributeFurigana(stemExpression, stemReading)) {
+        output.push(segment);
+    }
+
+    if (stemLength !== source.length) {
+        output.push({text: source.substring(stemLength)});
+    }
+
+    return output;
+}
+
+function jpConvertHalfWidthKanaToFullWidth(text, sourceMapping) {
+    let result = '';
+    const ii = text.length;
+    const hasSourceMapping = Array.isArray(sourceMapping);
+
+    for (let i = 0; i < ii; ++i) {
+        const c = text[i];
+        const mapping = JP_HALFWIDTH_KATAKANA_MAPPING.get(c);
+        if (typeof mapping !== 'string') {
+            result += c;
+            continue;
+        }
+
+        let index = 0;
+        switch (text.charCodeAt(i + 1)) {
+            case 0xff9e: // dakuten
+                index = 1;
+                break;
+            case 0xff9f: // handakuten
+                index = 2;
+                break;
+        }
+
+        let c2 = mapping[index];
+        if (index > 0) {
+            if (c2 === '-') { // invalid
+                index = 0;
+                c2 = mapping[0];
+            } else {
+                ++i;
+            }
+        }
+
+        if (hasSourceMapping && index > 0) {
+            index = result.length;
+            const v = sourceMapping.splice(index + 1, 1)[0];
+            sourceMapping[index] += v;
+        }
+        result += c2;
+    }
+
+    return result;
+}
+
+function jpConvertNumericTofullWidth(text) {
+    let result = '';
+    for (let i = 0, ii = text.length; i < ii; ++i) {
+        let c = text.charCodeAt(i);
+        if (c >= 0x30 && c <= 0x39) { // ['0', '9']
+            c += 0xff10 - 0x30; // 0xff10 = '0' full width
+            result += String.fromCharCode(c);
+        } else {
+            result += text[i];
+        }
+    }
+    return result;
+}
+
+function jpConvertAlphabeticToKana(text, sourceMapping) {
+    let part = '';
+    let result = '';
+    const ii = text.length;
+
+    if (sourceMapping.length === ii) {
+        sourceMapping.length = ii;
+        sourceMapping.fill(1);
+    }
+
+    for (let i = 0; i < ii; ++i) {
+        // Note: 0x61 is the character code for 'a'
+        let c = text.charCodeAt(i);
+        if (c >= 0x41 && c <= 0x5a) { // ['A', 'Z']
+            c += (0x61 - 0x41);
+        } else if (c >= 0x61 && c <= 0x7a) { // ['a', 'z']
+            // NOP; c += (0x61 - 0x61);
+        } else if (c >= 0xff21 && c <= 0xff3a) { // ['A', 'Z'] fullwidth
+            c += (0x61 - 0xff21);
+        } else if (c >= 0xff41 && c <= 0xff5a) { // ['a', 'z'] fullwidth
+            c += (0x61 - 0xff41);
+        } else if (c === 0x2d || c === 0xff0d) { // '-' or fullwidth dash
+            c = 0x2d; // '-'
+        } else {
+            if (part.length > 0) {
+                result += jpToHiragana(part, sourceMapping, result.length);
+                part = '';
+            }
+            result += text[i];
+            continue;
+        }
+        part += String.fromCharCode(c);
+    }
+
+    if (part.length > 0) {
+        result += jpToHiragana(part, sourceMapping, result.length);
+    }
+    return result;
+}
+
+function jpToHiragana(text, sourceMapping, sourceMappingStart) {
+    const result = wanakana.toHiragana(text);
+
+    // Generate source mapping
+    if (Array.isArray(sourceMapping)) {
+        if (typeof sourceMappingStart !== 'number') { sourceMappingStart = 0; }
+        let i = 0;
+        let resultPos = 0;
+        const ii = text.length;
+        while (i < ii) {
+            // Find smallest matching substring
+            let iNext = i + 1;
+            let resultPosNext = result.length;
+            while (iNext < ii) {
+                const t = wanakana.toHiragana(text.substring(0, iNext));
+                if (t === result.substring(0, t.length)) {
+                    resultPosNext = t.length;
+                    break;
+                }
+                ++iNext;
+            }
+
+            // Merge characters
+            const removals = iNext - i - 1;
+            if (removals > 0) {
+                let sum = 0;
+                const vs = sourceMapping.splice(sourceMappingStart + 1, removals);
+                for (const v of vs) { sum += v; }
+                sourceMapping[sourceMappingStart] += sum;
+            }
+            ++sourceMappingStart;
+
+            // Empty elements
+            const additions = resultPosNext - resultPos - 1;
+            for (let j = 0; j < additions; ++j) {
+                sourceMapping.splice(sourceMappingStart, 0, 0);
+                ++sourceMappingStart;
+            }
+
+            i = iNext;
+            resultPos = resultPosNext;
+        }
+    }
+
+    return result;
+}
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 74afbb68..bb7ac095 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -75,6 +75,7 @@
 
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/japanese.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/fg/js/document.js"></script>
         <script src="/fg/js/source.js"></script>
@@ -82,7 +83,6 @@
         <script src="/mixed/js/display-context.js"></script>
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/js/display-generator.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/scroll.js"></script>
         <script src="/mixed/js/text-scanner.js"></script>
 
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 77bcc359..3480b124 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -1084,12 +1084,12 @@
         <script src="/mixed/js/core.js"></script>
         <script src="/mixed/js/dom.js"></script>
         <script src="/mixed/js/api.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
 
         <script src="/bg/js/anki.js"></script>
         <script src="/bg/js/conditions.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/page-exit-prevention.js"></script>
         <script src="/bg/js/profile-conditions.js"></script>
diff --git a/ext/mixed/js/japanese.js b/ext/mixed/js/japanese.js
deleted file mode 100644
index 0da822d7..00000000
--- a/ext/mixed/js/japanese.js
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-const JP_HALFWIDTH_KATAKANA_MAPPING = new Map([
-    ['ｦ', 'ヲヺ-'],
-    ['ｧ', 'ァ--'],
-    ['ｨ', 'ィ--'],
-    ['ｩ', 'ゥ--'],
-    ['ｪ', 'ェ--'],
-    ['ｫ', 'ォ--'],
-    ['ｬ', 'ャ--'],
-    ['ｭ', 'ュ--'],
-    ['ｮ', 'ョ--'],
-    ['ｯ', 'ッ--'],
-    ['ｰ', 'ー--'],
-    ['ｱ', 'ア--'],
-    ['ｲ', 'イ--'],
-    ['ｳ', 'ウヴ-'],
-    ['ｴ', 'エ--'],
-    ['ｵ', 'オ--'],
-    ['ｶ', 'カガ-'],
-    ['ｷ', 'キギ-'],
-    ['ｸ', 'クグ-'],
-    ['ｹ', 'ケゲ-'],
-    ['ｺ', 'コゴ-'],
-    ['ｻ', 'サザ-'],
-    ['ｼ', 'シジ-'],
-    ['ｽ', 'スズ-'],
-    ['ｾ', 'セゼ-'],
-    ['ｿ', 'ソゾ-'],
-    ['ﾀ', 'タダ-'],
-    ['ﾁ', 'チヂ-'],
-    ['ﾂ', 'ツヅ-'],
-    ['ﾃ', 'テデ-'],
-    ['ﾄ', 'トド-'],
-    ['ﾅ', 'ナ--'],
-    ['ﾆ', 'ニ--'],
-    ['ﾇ', 'ヌ--'],
-    ['ﾈ', 'ネ--'],
-    ['ﾉ', 'ノ--'],
-    ['ﾊ', 'ハバパ'],
-    ['ﾋ', 'ヒビピ'],
-    ['ﾌ', 'フブプ'],
-    ['ﾍ', 'ヘベペ'],
-    ['ﾎ', 'ホボポ'],
-    ['ﾏ', 'マ--'],
-    ['ﾐ', 'ミ--'],
-    ['ﾑ', 'ム--'],
-    ['ﾒ', 'メ--'],
-    ['ﾓ', 'モ--'],
-    ['ﾔ', 'ヤ--'],
-    ['ﾕ', 'ユ--'],
-    ['ﾖ', 'ヨ--'],
-    ['ﾗ', 'ラ--'],
-    ['ﾘ', 'リ--'],
-    ['ﾙ', 'ル--'],
-    ['ﾚ', 'レ--'],
-    ['ﾛ', 'ロ--'],
-    ['ﾜ', 'ワ--'],
-    ['ﾝ', 'ン--']
-]);
-
-const JP_HIRAGANA_RANGE = [0x3040, 0x309f];
-const JP_KATAKANA_RANGE = [0x30a0, 0x30ff];
-const JP_KANA_RANGES = [JP_HIRAGANA_RANGE, JP_KATAKANA_RANGE];
-
-const JP_CJK_COMMON_RANGE = [0x4e00, 0x9fff];
-const JP_CJK_RARE_RANGE = [0x3400, 0x4dbf];
-const JP_CJK_RANGES = [JP_CJK_COMMON_RANGE, JP_CJK_RARE_RANGE];
-
-const JP_ITERATION_MARK_CHAR_CODE = 0x3005;
-
-// Japanese character ranges, roughly ordered in order of expected frequency
-const JP_JAPANESE_RANGES = [
-    JP_HIRAGANA_RANGE,
-    JP_KATAKANA_RANGE,
-
-    JP_CJK_COMMON_RANGE,
-    JP_CJK_RARE_RANGE,
-
-    [0xff66, 0xff9f], // Halfwidth katakana
-
-    [0x30fb, 0x30fc], // Katakana punctuation
-    [0xff61, 0xff65], // Kana punctuation
-    [0x3000, 0x303f], // CJK punctuation
-
-    [0xff10, 0xff19], // Fullwidth numbers
-    [0xff21, 0xff3a], // Fullwidth upper case Latin letters
-    [0xff41, 0xff5a], // Fullwidth lower case Latin letters
-
-    [0xff01, 0xff0f], // Fullwidth punctuation 1
-    [0xff1a, 0xff1f], // Fullwidth punctuation 2
-    [0xff3b, 0xff3f], // Fullwidth punctuation 3
-    [0xff5b, 0xff60], // Fullwidth punctuation 4
-    [0xffe0, 0xffee], // Currency markers
-];
-
-
-// Helper functions
-
-function _jpIsCharCodeInRanges(charCode, ranges) {
-    for (const [min, max] of ranges) {
-        if (charCode >= min && charCode <= max) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-// Character code testing functions
-
-function jpIsCharCodeKanji(charCode) {
-    return _jpIsCharCodeInRanges(charCode, JP_CJK_RANGES);
-}
-
-function jpIsCharCodeKana(charCode) {
-    return _jpIsCharCodeInRanges(charCode, JP_KANA_RANGES);
-}
-
-function jpIsCharCodeJapanese(charCode) {
-    return _jpIsCharCodeInRanges(charCode, JP_JAPANESE_RANGES);
-}
-
-
-// String testing functions
-
-function jpIsStringEntirelyKana(str) {
-    if (str.length === 0) { return false; }
-    for (let i = 0, ii = str.length; i < ii; ++i) {
-        if (!jpIsCharCodeKana(str.charCodeAt(i))) {
-            return false;
-        }
-    }
-    return true;
-}
-
-function jpIsStringPartiallyJapanese(str) {
-    if (str.length === 0) { return false; }
-    for (let i = 0, ii = str.length; i < ii; ++i) {
-        if (jpIsCharCodeJapanese(str.charCodeAt(i))) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-// Conversion functions
-
-function jpKatakanaToHiragana(text) {
-    let result = '';
-    for (const c of text) {
-        if (wanakana.isKatakana(c)) {
-            result += wanakana.toHiragana(c);
-        } else {
-            result += c;
-        }
-    }
-
-    return result;
-}
-
-function jpHiraganaToKatakana(text) {
-    let result = '';
-    for (const c of text) {
-        if (wanakana.isHiragana(c)) {
-            result += wanakana.toKatakana(c);
-        } else {
-            result += c;
-        }
-    }
-
-    return result;
-}
-
-function jpToRomaji(text) {
-    return wanakana.toRomaji(text);
-}
-
-function jpConvertReading(expressionFragment, readingFragment, readingMode) {
-    switch (readingMode) {
-        case 'hiragana':
-            return jpKatakanaToHiragana(readingFragment || '');
-        case 'katakana':
-            return jpHiraganaToKatakana(readingFragment || '');
-        case 'romaji':
-            if (readingFragment) {
-                return jpToRomaji(readingFragment);
-            } else {
-                if (jpIsStringEntirelyKana(expressionFragment)) {
-                    return jpToRomaji(expressionFragment);
-                }
-            }
-            return readingFragment;
-        case 'none':
-            return null;
-        default:
-            return readingFragment;
-    }
-}
-
-function jpDistributeFurigana(expression, reading) {
-    const fallback = [{furigana: reading, text: expression}];
-    if (!reading) {
-        return fallback;
-    }
-
-    let isAmbiguous = false;
-    const segmentize = (reading, groups) => {
-        if (groups.length === 0 || isAmbiguous) {
-            return [];
-        }
-
-        const group = groups[0];
-        if (group.mode === 'kana') {
-            if (jpKatakanaToHiragana(reading).startsWith(jpKatakanaToHiragana(group.text))) {
-                const readingLeft = reading.substring(group.text.length);
-                const segs = segmentize(readingLeft, groups.splice(1));
-                if (segs) {
-                    return [{text: group.text}].concat(segs);
-                }
-            }
-        } else {
-            let foundSegments = null;
-            for (let i = reading.length; i >= group.text.length; --i) {
-                const readingUsed = reading.substring(0, i);
-                const readingLeft = reading.substring(i);
-                const segs = segmentize(readingLeft, groups.slice(1));
-                if (segs) {
-                    if (foundSegments !== null) {
-                        // more than one way to segmentize the tail, mark as ambiguous
-                        isAmbiguous = true;
-                        return null;
-                    }
-                    foundSegments = [{text: group.text, furigana: readingUsed}].concat(segs);
-                }
-                // there is only one way to segmentize the last non-kana group
-                if (groups.length === 1) {
-                    break;
-                }
-            }
-            return foundSegments;
-        }
-    };
-
-    const groups = [];
-    let modePrev = null;
-    for (const c of expression) {
-        const charCode = c.charCodeAt(0);
-        const modeCurr = jpIsCharCodeKanji(charCode) || charCode === JP_ITERATION_MARK_CHAR_CODE ? 'kanji' : 'kana';
-        if (modeCurr === modePrev) {
-            groups[groups.length - 1].text += c;
-        } else {
-            groups.push({mode: modeCurr, text: c});
-            modePrev = modeCurr;
-        }
-    }
-
-    const segments = segmentize(reading, groups);
-    if (segments && !isAmbiguous) {
-        return segments;
-    }
-    return fallback;
-}
-
-function jpDistributeFuriganaInflected(expression, reading, source) {
-    const output = [];
-
-    let stemLength = 0;
-    const shortest = Math.min(source.length, expression.length);
-    const sourceHiragana = jpKatakanaToHiragana(source);
-    const expressionHiragana = jpKatakanaToHiragana(expression);
-    while (stemLength < shortest && sourceHiragana[stemLength] === expressionHiragana[stemLength]) {
-        ++stemLength;
-    }
-    const offset = source.length - stemLength;
-
-    const stemExpression = source.substring(0, source.length - offset);
-    const stemReading = reading.substring(
-        0,
-        offset === 0 ? reading.length : reading.length - expression.length + stemLength
-    );
-    for (const segment of jpDistributeFurigana(stemExpression, stemReading)) {
-        output.push(segment);
-    }
-
-    if (stemLength !== source.length) {
-        output.push({text: source.substring(stemLength)});
-    }
-
-    return output;
-}
-
-function jpConvertHalfWidthKanaToFullWidth(text, sourceMapping) {
-    let result = '';
-    const ii = text.length;
-    const hasSourceMapping = Array.isArray(sourceMapping);
-
-    for (let i = 0; i < ii; ++i) {
-        const c = text[i];
-        const mapping = JP_HALFWIDTH_KATAKANA_MAPPING.get(c);
-        if (typeof mapping !== 'string') {
-            result += c;
-            continue;
-        }
-
-        let index = 0;
-        switch (text.charCodeAt(i + 1)) {
-            case 0xff9e: // dakuten
-                index = 1;
-                break;
-            case 0xff9f: // handakuten
-                index = 2;
-                break;
-        }
-
-        let c2 = mapping[index];
-        if (index > 0) {
-            if (c2 === '-') { // invalid
-                index = 0;
-                c2 = mapping[0];
-            } else {
-                ++i;
-            }
-        }
-
-        if (hasSourceMapping && index > 0) {
-            index = result.length;
-            const v = sourceMapping.splice(index + 1, 1)[0];
-            sourceMapping[index] += v;
-        }
-        result += c2;
-    }
-
-    return result;
-}
-
-function jpConvertNumericTofullWidth(text) {
-    let result = '';
-    for (let i = 0, ii = text.length; i < ii; ++i) {
-        let c = text.charCodeAt(i);
-        if (c >= 0x30 && c <= 0x39) { // ['0', '9']
-            c += 0xff10 - 0x30; // 0xff10 = '0' full width
-            result += String.fromCharCode(c);
-        } else {
-            result += text[i];
-        }
-    }
-    return result;
-}
-
-function jpConvertAlphabeticToKana(text, sourceMapping) {
-    let part = '';
-    let result = '';
-    const ii = text.length;
-
-    if (sourceMapping.length === ii) {
-        sourceMapping.length = ii;
-        sourceMapping.fill(1);
-    }
-
-    for (let i = 0; i < ii; ++i) {
-        // Note: 0x61 is the character code for 'a'
-        let c = text.charCodeAt(i);
-        if (c >= 0x41 && c <= 0x5a) { // ['A', 'Z']
-            c += (0x61 - 0x41);
-        } else if (c >= 0x61 && c <= 0x7a) { // ['a', 'z']
-            // NOP; c += (0x61 - 0x61);
-        } else if (c >= 0xff21 && c <= 0xff3a) { // ['A', 'Z'] fullwidth
-            c += (0x61 - 0xff21);
-        } else if (c >= 0xff41 && c <= 0xff5a) { // ['a', 'z'] fullwidth
-            c += (0x61 - 0xff41);
-        } else if (c === 0x2d || c === 0xff0d) { // '-' or fullwidth dash
-            c = 0x2d; // '-'
-        } else {
-            if (part.length > 0) {
-                result += jpToHiragana(part, sourceMapping, result.length);
-                part = '';
-            }
-            result += text[i];
-            continue;
-        }
-        part += String.fromCharCode(c);
-    }
-
-    if (part.length > 0) {
-        result += jpToHiragana(part, sourceMapping, result.length);
-    }
-    return result;
-}
-
-function jpToHiragana(text, sourceMapping, sourceMappingStart) {
-    const result = wanakana.toHiragana(text);
-
-    // Generate source mapping
-    if (Array.isArray(sourceMapping)) {
-        if (typeof sourceMappingStart !== 'number') { sourceMappingStart = 0; }
-        let i = 0;
-        let resultPos = 0;
-        const ii = text.length;
-        while (i < ii) {
-            // Find smallest matching substring
-            let iNext = i + 1;
-            let resultPosNext = result.length;
-            while (iNext < ii) {
-                const t = wanakana.toHiragana(text.substring(0, iNext));
-                if (t === result.substring(0, t.length)) {
-                    resultPosNext = t.length;
-                    break;
-                }
-                ++iNext;
-            }
-
-            // Merge characters
-            const removals = iNext - i - 1;
-            if (removals > 0) {
-                let sum = 0;
-                const vs = sourceMapping.splice(sourceMappingStart + 1, removals);
-                for (const v of vs) { sum += v; }
-                sourceMapping[sourceMappingStart] += sum;
-            }
-            ++sourceMappingStart;
-
-            // Empty elements
-            const additions = resultPosNext - resultPos - 1;
-            for (let j = 0; j < additions; ++j) {
-                sourceMapping.splice(sourceMappingStart, 0, 0);
-                ++sourceMappingStart;
-            }
-
-            i = iNext;
-            resultPos = resultPosNext;
-        }
-    }
-
-    return result;
-}
-- 
cgit v1.2.3


From f85f92c665736c759aa9d325d6d36f236fc21485 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:48:47 -0500
Subject: Remove trailing comma

---
 ext/bg/js/japanese.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
index 0da822d7..c45c0958 100644
--- a/ext/bg/js/japanese.js
+++ b/ext/bg/js/japanese.js
@@ -108,7 +108,7 @@ const JP_JAPANESE_RANGES = [
     [0xff1a, 0xff1f], // Fullwidth punctuation 2
     [0xff3b, 0xff3f], // Fullwidth punctuation 3
     [0xff5b, 0xff60], // Fullwidth punctuation 4
-    [0xffe0, 0xffee], // Currency markers
+    [0xffe0, 0xffee]  // Currency markers
 ];
 
 
-- 
cgit v1.2.3


From d5708de4eed15567e14e0c1fd4998561eee1680e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 14:39:26 -0500
Subject: Fix undefined reject

---
 ext/bg/js/backend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index eeab68a5..43ee81c3 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -708,7 +708,7 @@ class Backend {
         }
 
         try {
-            const tabWindow = await new Promise((resolve) => {
+            const tabWindow = await new Promise((resolve, reject) => {
                 chrome.windows.get(tab.windowId, {}, (tabWindow) => {
                     const e = chrome.runtime.lastError;
                     if (e) { reject(e); }
-- 
cgit v1.2.3


From ddc7c71e4f9da861d9d2bd56e60804ee9e70f621 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 25 Jan 2020 17:54:07 +0200
Subject: add support for native popup windows

---
 ext/bg/js/backend.js | 54 +++++++++++++++++++++++++++++++++++++---------------
 ext/bg/js/context.js |  4 ++--
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 43ee81c3..23811e9d 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -33,6 +33,7 @@ class Backend {
         this.isPreparedPromise = new Promise((resolve) => (this.isPreparedResolve = resolve));
 
         this.clipboardPasteTarget = document.querySelector('#clipboard-paste-target');
+        this.popupWindow = null;
 
         this.apiForwarder = new BackendApiForwarder();
     }
@@ -565,23 +566,46 @@ class Backend {
     // Command handlers
 
     async _onCommandSearch(params) {
-        const url = chrome.runtime.getURL('/bg/search.html');
-        if (!(params && params.newTab)) {
-            try {
-                const tab = await Backend._findTab(1000, (url2) => (
-                    url2 !== null &&
-                    url2.startsWith(url) &&
-                    (url2.length === url.length || url2[url.length] === '?' || url2[url.length] === '#')
-                ));
-                if (tab !== null) {
-                    await Backend._focusTab(tab);
-                    return;
+        const {mode, query} = params || {};
+
+        const optionsContext = {depth: 0};
+        const options = await this.getOptions(optionsContext);
+        const {popupWidth, popupHeight} = options.general;
+
+        const baseUrl = chrome.runtime.getURL('/bg/search.html');
+        const queryString = (query && query.length > 0) ? `?query=${encodeURIComponent(query)}` : '';
+        const url = baseUrl + queryString;
+
+        switch (mode) {
+            case 'sameTab':
+                try {
+                    const tab = await Backend._findTab(1000, (url2) => (
+                        url2 !== null &&
+                        url2.startsWith(url) &&
+                        (url2.length === url.length || url2[url.length] === '?' || url2[url.length] === '#')
+                    ));
+                    if (tab !== null) {
+                        await Backend._focusTab(tab);
+                        return;
+                    }
+                } catch (e) {
+                    // NOP
                 }
-            } catch (e) {
-                // NOP
-            }
+                chrome.tabs.create({url});
+                return;
+            case 'newTab':
+                chrome.tabs.create({url});
+                return;
+            case 'popup':
+                if (this.popupWindow !== null) {
+                    chrome.windows.remove(this.popupWindow.id);
+                }
+                chrome.windows.create(
+                    {url, width: popupWidth, height: popupHeight, type: 'popup'},
+                    (popupWindow) => { this.popupWindow = popupWindow; }
+                );
+                return;
         }
-        chrome.tabs.create({url});
     }
 
     _onCommandHelp() {
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
index 834174bf..a0e5adc9 100644
--- a/ext/bg/js/context.js
+++ b/ext/bg/js/context.js
@@ -30,12 +30,12 @@ function setupButtonEvents(selector, command, url) {
     for (const node of nodes) {
         node.addEventListener('click', (e) => {
             if (e.button !== 0) { return; }
-            apiCommandExec(command, {newTab: e.ctrlKey});
+            apiCommandExec(command, {mode: e.ctrlKey ? 'newTab' : 'sameTab'});
             e.preventDefault();
         }, false);
         node.addEventListener('auxclick', (e) => {
             if (e.button !== 1) { return; }
-            apiCommandExec(command, {newTab: true});
+            apiCommandExec(command, {mode: 'newTab'});
             e.preventDefault();
         }, false);
 
-- 
cgit v1.2.3


From 679e42c21ccc3ab778f4b26406b353769e171878 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 25 Jan 2020 18:11:19 +0200
Subject: move apiClipboardGet Firefox handling to Backend

---
 ext/bg/js/backend.js | 31 ++++++++++++++++++++++++-------
 ext/bg/js/search.js  | 44 +++++++-------------------------------------
 2 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 23811e9d..2fb7711f 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -522,13 +522,30 @@ class Backend {
     }
 
     async _onApiClipboardGet() {
-        const clipboardPasteTarget = this.clipboardPasteTarget;
-        clipboardPasteTarget.value = '';
-        clipboardPasteTarget.focus();
-        document.execCommand('paste');
-        const result = clipboardPasteTarget.value;
-        clipboardPasteTarget.value = '';
-        return result;
+        /*
+        Notes:
+            document.execCommand('paste') doesn't work on Firefox.
+            This may be a bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1603985
+            Therefore, navigator.clipboard.readText() is used on Firefox.
+
+            navigator.clipboard.readText() can't be used in Chrome for two reasons:
+            * Requires page to be focused, else it rejects with an exception.
+            * When the page is focused, Chrome will request clipboard permission, despite already
+              being an extension with clipboard permissions. It effectively asks for the
+              non-extension permission for clipboard access.
+        */
+        const browser = await Backend._getBrowser();
+        if (browser === 'firefox' || browser === 'firefox-mobile') {
+            return await navigator.clipboard.readText();
+        } else {
+            const clipboardPasteTarget = this.clipboardPasteTarget;
+            clipboardPasteTarget.value = '';
+            clipboardPasteTarget.focus();
+            document.execCommand('paste');
+            const result = clipboardPasteTarget.value;
+            clipboardPasteTarget.value = '';
+            return result;
+        }
     }
 
     async _onApiGetDisplayTemplatesHtml() {
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index f5c641a8..9508346e 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -36,8 +36,6 @@ class DisplaySearch extends Display {
         this.introVisible = true;
         this.introAnimationTimer = null;
 
-        this.isFirefox = false;
-
         this.clipboardMonitorTimerId = null;
         this.clipboardMonitorTimerToken = null;
         this.clipboardInterval = 250;
@@ -53,7 +51,6 @@ class DisplaySearch extends Display {
     async prepare() {
         try {
             await this.initialize();
-            this.isFirefox = await DisplaySearch._isFirefox();
 
             if (this.search !== null) {
                 this.search.addEventListener('click', (e) => this.onSearch(e), false);
@@ -250,13 +247,18 @@ class DisplaySearch extends Display {
 
     startClipboardMonitor() {
         // The token below is used as a unique identifier to ensure that a new clipboard monitor
-        // hasn't been started during the await call. The check below the await this.getClipboardText()
+        // hasn't been started during the await call. The check below the await apiClipboardGet()
         // call will exit early if the reference has changed.
         const token = {};
         const intervalCallback = async () => {
             this.clipboardMonitorTimerId = null;
 
-            let text = await this.getClipboardText();
+            let text = null;
+            try {
+                text = await apiClipboardGet();
+            } catch (e) {
+                // NOP
+            }
             if (this.clipboardMonitorTimerToken !== token) { return; }
 
             if (
@@ -288,27 +290,6 @@ class DisplaySearch extends Display {
         }
     }
 
-    async getClipboardText() {
-        /*
-        Notes:
-            apiClipboardGet doesn't work on Firefox because document.execCommand('paste')
-            results in an empty string on the web extension background page.
-            This may be a bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1603985
-            Therefore, navigator.clipboard.readText() is used on Firefox.
-
-            navigator.clipboard.readText() can't be used in Chrome for two reasons:
-            * Requires page to be focused, else it rejects with an exception.
-            * When the page is focused, Chrome will request clipboard permission, despite already
-              being an extension with clipboard permissions. It effectively asks for the
-              non-extension permission for clipboard access.
-        */
-        try {
-            return this.isFirefox ? await navigator.clipboard.readText() : await apiClipboardGet();
-        } catch (e) {
-            return null;
-        }
-    }
-
     isWanakanaEnabled() {
         return this.wanakanaEnable !== null && this.wanakanaEnable.checked;
     }
@@ -399,17 +380,6 @@ class DisplaySearch extends Display {
         const match = /^[^?#]*\?(?:[^&#]*&)?query=([^&#]*)/.exec(url);
         return match !== null ? decodeURIComponent(match[1]) : null;
     }
-
-    static async _isFirefox() {
-        const {browser} = await apiGetEnvironmentInfo();
-        switch (browser) {
-            case 'firefox':
-            case 'firefox-mobile':
-                return true;
-            default:
-                return false;
-        }
-    }
 }
 
 DisplaySearch.onKeyDownIgnoreKeys = {
-- 
cgit v1.2.3


From f29abfc5115b06281c18467d7cf7b43bf133da82 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 25 Jan 2020 18:18:40 +0200
Subject: use correct optionsContext

---
 ext/bg/js/backend.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 2fb7711f..3cb9ce1d 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -585,8 +585,7 @@ class Backend {
     async _onCommandSearch(params) {
         const {mode, query} = params || {};
 
-        const optionsContext = {depth: 0};
-        const options = await this.getOptions(optionsContext);
+        const options = await this.getOptions(this.optionsContext);
         const {popupWidth, popupHeight} = options.general;
 
         const baseUrl = chrome.runtime.getURL('/bg/search.html');
-- 
cgit v1.2.3


From 939ad42dacfeff566497f3c2f8e9c64d59b8168d Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 25 Jan 2020 19:00:36 +0200
Subject: add global clipboard monitor that spawns popups

TODO: refactor the search page clipboard monitor and popup clipboard
monitor to use a common ClipboardMonitor class
---
 ext/bg/data/options-schema.json |  5 +++++
 ext/bg/js/backend.js            | 17 +++++++++++++++++
 ext/bg/js/options.js            |  1 +
 ext/bg/js/settings/main.js      |  1 +
 ext/bg/settings.html            |  4 ++++
 5 files changed, 28 insertions(+)

diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json
index 7e12481d..d6207952 100644
--- a/ext/bg/data/options-schema.json
+++ b/ext/bg/data/options-schema.json
@@ -79,6 +79,7 @@
                                 "type": "object",
                                 "required": [
                                     "enable",
+                                    "enableClipboardPopups",
                                     "resultOutputMode",
                                     "debugInfo",
                                     "maxResults",
@@ -111,6 +112,10 @@
                                         "type": "boolean",
                                         "default": true
                                     },
+                                    "enableClipboardPopups": {
+                                        "type": "boolean",
+                                        "default": false
+                                    },
                                     "resultOutputMode": {
                                         "type": "string",
                                         "enum": ["group", "merge", "split"],
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 3cb9ce1d..407dc965 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -34,6 +34,9 @@ class Backend {
 
         this.clipboardPasteTarget = document.querySelector('#clipboard-paste-target');
         this.popupWindow = null;
+        this.clipboardPopupTimerId = null;
+        this.clipboardInterval = 250;
+        this.clipboardPreviousText = null;
 
         this.apiForwarder = new BackendApiForwarder();
     }
@@ -122,6 +125,20 @@ class Backend {
         } else {
             this.mecab.stopListener();
         }
+
+        window.clearInterval(this.clipboardPopupTimerId);
+        if (options.general.enableClipboardPopups) {
+            this.clipboardPopupTimerId = setInterval(() => {
+                this._onApiClipboardGet()
+                .then((result) => {
+                    if (this.clipboardPreviousText === result) {
+                        return;
+                    }
+                    this._onCommandSearch({mode: 'popup', query: result});
+                    this.clipboardPreviousText = result;
+                });
+            }, this.clipboardInterval);
+        }
     }
 
     async getOptionsSchema() {
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 78508059..97032660 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -266,6 +266,7 @@ function profileOptionsCreateDefaults() {
     return {
         general: {
             enable: true,
+            enableClipboardPopups: false,
             resultOutputMode: 'group',
             debugInfo: false,
             maxResults: 32,
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 4492cd42..ad3459f0 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -28,6 +28,7 @@ function getOptionsFullMutable() {
 
 async function formRead(options) {
     options.general.enable = $('#enable').prop('checked');
+    options.general.enableClipboardPopups = $('#enable-clipboard-popups').prop('checked');
     options.general.showGuide = $('#show-usage-guide').prop('checked');
     options.general.compactTags = $('#compact-tags').prop('checked');
     options.general.compactGlossaries = $('#compact-glossaries').prop('checked');
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 3480b124..b0fcec2b 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -134,6 +134,10 @@
                     <label><input type="checkbox" id="enable"> Enable content scanning</label>
                 </div>
 
+                <div class="checkbox">
+                    <label><input type="checkbox" id="enable-clipboard-popups"> Enable native popups when copying Japanese text</label>
+                </div>
+
                 <div class="checkbox">
                     <label><input type="checkbox" id="show-usage-guide"> Show usage guide on startup</label>
                 </div>
-- 
cgit v1.2.3


From 222f869c842b13d4bc7464a8fa2cceff6f64fa00 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 26 Jan 2020 02:11:48 +0200
Subject: fix search page hotkey

---
 ext/bg/js/backend.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 407dc965..d80e7713 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -600,7 +600,7 @@ class Backend {
     // Command handlers
 
     async _onCommandSearch(params) {
-        const {mode, query} = params || {};
+        const {mode, query} = params || {mode: 'sameTab'};
 
         const options = await this.getOptions(this.optionsContext);
         const {popupWidth, popupHeight} = options.general;
-- 
cgit v1.2.3


From 37a922adc0721520dac2f376b85ed2c8b5e42e69 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 26 Jan 2020 02:13:01 +0200
Subject: fix settings page checkbox

---
 ext/bg/js/settings/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index ad3459f0..55472a7b 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -105,6 +105,7 @@ async function formRead(options) {
 
 async function formWrite(options) {
     $('#enable').prop('checked', options.general.enable);
+    $('#enable-clipboard-popups').prop('checked', options.general.enableClipboardPopups);
     $('#show-usage-guide').prop('checked', options.general.showGuide);
     $('#compact-tags').prop('checked', options.general.compactTags);
     $('#compact-glossaries').prop('checked', options.general.compactGlossaries);
-- 
cgit v1.2.3


From c685fd0e5f90c32911a225f0aaa68f5ff9fdfb7b Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 26 Jan 2020 03:02:33 +0200
Subject: extract ClipboardMonitor from DisplaySearch

---
 ext/bg/js/clipboard-monitor.js | 78 ++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/search.js            | 78 ++++++++++--------------------------------
 ext/bg/search.html             |  1 +
 3 files changed, 97 insertions(+), 60 deletions(-)
 create mode 100644 ext/bg/js/clipboard-monitor.js

diff --git a/ext/bg/js/clipboard-monitor.js b/ext/bg/js/clipboard-monitor.js
new file mode 100644
index 00000000..579cdc56
--- /dev/null
+++ b/ext/bg/js/clipboard-monitor.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+class ClipboardMonitor {
+    constructor() {
+        this.timerId = null;
+        this.timerToken = null;
+        this.interval = 250;
+        this.previousText = null;
+    }
+
+    onClipboardText(_text) {
+        throw new Error('Override me');
+    }
+
+    start() {
+        // The token below is used as a unique identifier to ensure that a new clipboard monitor
+        // hasn't been started during the await call. The check below the await apiClipboardGet()
+        // call will exit early if the reference has changed.
+        const token = {};
+        const intervalCallback = async () => {
+            this.timerId = null;
+
+            let text = null;
+            try {
+                text = await apiClipboardGet();
+            } catch (e) {
+                // NOP
+            }
+            if (this.timerToken !== token) { return; }
+
+            if (
+                typeof text === 'string' &&
+                (text = text.trim()).length > 0 &&
+                text !== this.previousText
+            ) {
+                this.previousText = text;
+                if (jpIsStringPartiallyJapanese(text)) {
+                    this.onClipboardText(text);
+                }
+            }
+
+            this.timerId = setTimeout(intervalCallback, this.interval);
+        };
+
+        this.timerToken = token;
+
+        intervalCallback();
+    }
+
+    stop() {
+        this.timerToken = null;
+        if (this.timerId !== null) {
+            clearTimeout(this.timerId);
+            this.timerId = null;
+        }
+    }
+
+    setPreviousText(text) {
+        this.previousText = text;
+    }
+}
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 9508346e..e32ba46e 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -36,10 +36,7 @@ class DisplaySearch extends Display {
         this.introVisible = true;
         this.introAnimationTimer = null;
 
-        this.clipboardMonitorTimerId = null;
-        this.clipboardMonitorTimerToken = null;
-        this.clipboardInterval = 250;
-        this.clipboardPreviousText = null;
+        this.clipboardMonitor = new ClipboardMonitor();
     }
 
     static create() {
@@ -93,7 +90,7 @@ class DisplaySearch extends Display {
             if (this.clipboardMonitorEnable !== null) {
                 if (this.options.general.enableClipboardMonitor === true) {
                     this.clipboardMonitorEnable.checked = true;
-                    this.startClipboardMonitor();
+                    this.clipboardMonitor.start();
                 } else {
                     this.clipboardMonitorEnable.checked = false;
                 }
@@ -103,7 +100,7 @@ class DisplaySearch extends Display {
                             {permissions: ['clipboardRead']},
                             (granted) => {
                                 if (granted) {
-                                    this.startClipboardMonitor();
+                                    this.clipboardMonitor.start();
                                     apiOptionsSet({general: {enableClipboardMonitor: true}}, this.getOptionsContext());
                                 } else {
                                     e.target.checked = false;
@@ -111,16 +108,18 @@ class DisplaySearch extends Display {
                             }
                         );
                     } else {
-                        this.stopClipboardMonitor();
+                        this.clipboardMonitor.stop();
                         apiOptionsSet({general: {enableClipboardMonitor: false}}, this.getOptionsContext());
                     }
                 });
             }
 
             window.addEventListener('popstate', (e) => this.onPopState(e));
+            window.addEventListener('copy', (e) => this.onCopy(e));
+
+            this.clipboardMonitor.onClipboardText = (text) => this.onClipboardText(text);
 
             this.updateSearchButton();
-            this.initClipboardMonitor();
         } catch (e) {
             this.onError(e);
         }
@@ -199,6 +198,17 @@ class DisplaySearch extends Display {
         }
     }
 
+    onCopy() {
+        // ignore copy from search page
+        this.clipboardMonitor.setPreviousText(document.getSelection().toString().trim());
+    }
+
+    onClipboardText(text) {
+        this.setQuery(this.isWanakanaEnabled() ? window.wanakana.toKana(text) : text);
+        window.history.pushState(null, '', `${window.location.pathname}?query=${encodeURIComponent(text)}`);
+        this.onSearchQueryUpdated(this.query.value, true);
+    }
+
     async onSearchQueryUpdated(query, animate) {
         try {
             const details = {};
@@ -238,58 +248,6 @@ class DisplaySearch extends Display {
         this.queryParser.setOptions(this.options);
     }
 
-    initClipboardMonitor() {
-        // ignore copy from search page
-        window.addEventListener('copy', () => {
-            this.clipboardPreviousText = document.getSelection().toString().trim();
-        });
-    }
-
-    startClipboardMonitor() {
-        // The token below is used as a unique identifier to ensure that a new clipboard monitor
-        // hasn't been started during the await call. The check below the await apiClipboardGet()
-        // call will exit early if the reference has changed.
-        const token = {};
-        const intervalCallback = async () => {
-            this.clipboardMonitorTimerId = null;
-
-            let text = null;
-            try {
-                text = await apiClipboardGet();
-            } catch (e) {
-                // NOP
-            }
-            if (this.clipboardMonitorTimerToken !== token) { return; }
-
-            if (
-                typeof text === 'string' &&
-                (text = text.trim()).length > 0 &&
-                text !== this.clipboardPreviousText
-            ) {
-                this.clipboardPreviousText = text;
-                if (jpIsStringPartiallyJapanese(text)) {
-                    this.setQuery(this.isWanakanaEnabled() ? window.wanakana.toKana(text) : text);
-                    window.history.pushState(null, '', `${window.location.pathname}?query=${encodeURIComponent(text)}`);
-                    this.onSearchQueryUpdated(this.query.value, true);
-                }
-            }
-
-            this.clipboardMonitorTimerId = setTimeout(intervalCallback, this.clipboardInterval);
-        };
-
-        this.clipboardMonitorTimerToken = token;
-
-        intervalCallback();
-    }
-
-    stopClipboardMonitor() {
-        this.clipboardMonitorTimerToken = null;
-        if (this.clipboardMonitorTimerId !== null) {
-            clearTimeout(this.clipboardMonitorTimerId);
-            this.clipboardMonitorTimerId = null;
-        }
-    }
-
     isWanakanaEnabled() {
         return this.wanakanaEnable !== null && this.wanakanaEnable.checked;
     }
diff --git a/ext/bg/search.html b/ext/bg/search.html
index bb7ac095..bb555e92 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -87,6 +87,7 @@
         <script src="/mixed/js/text-scanner.js"></script>
 
         <script src="/bg/js/search-query-parser.js"></script>
+        <script src="/bg/js/clipboard-monitor.js"></script>
         <script src="/bg/js/search.js"></script>
         <script src="/bg/js/search-frontend.js"></script>
     </body>
-- 
cgit v1.2.3


From 90a5d795708898fba940f77358269354e96355a7 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 26 Jan 2020 03:31:31 +0200
Subject: use ClipboardMonitor in Backend

---
 ext/bg/background.html |  1 +
 ext/bg/js/api.js       |  4 ++++
 ext/bg/js/backend.js   | 25 +++++++++++--------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ext/bg/background.html b/ext/bg/background.html
index e6d32593..11023221 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -26,6 +26,7 @@
         <script src="/bg/js/mecab.js"></script>
         <script src="/bg/js/audio.js"></script>
         <script src="/bg/js/backend-api-forwarder.js"></script>
+        <script src="/bg/js/clipboard-monitor.js"></script>
         <script src="/bg/js/conditions.js"></script>
         <script src="/bg/js/database.js"></script>
         <script src="/bg/js/deinflector.js"></script>
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 285b8016..f4be7a0c 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -29,6 +29,10 @@ function apiGetDisplayTemplatesHtml() {
     return _apiInvoke('getDisplayTemplatesHtml');
 }
 
+function apiClipboardGet() {
+    return _apiInvoke('clipboardGet');
+}
+
 function _apiInvoke(action, params={}) {
     const data = {action, params};
     return new Promise((resolve, reject) => {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index d80e7713..fa1660c2 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -22,6 +22,7 @@ class Backend {
         this.translator = new Translator();
         this.anki = new AnkiNull();
         this.mecab = new Mecab();
+        this.clipboardMonitor = new ClipboardMonitor();
         this.options = null;
         this.optionsSchema = null;
         this.optionsContext = {
@@ -33,10 +34,8 @@ class Backend {
         this.isPreparedPromise = new Promise((resolve) => (this.isPreparedResolve = resolve));
 
         this.clipboardPasteTarget = document.querySelector('#clipboard-paste-target');
+
         this.popupWindow = null;
-        this.clipboardPopupTimerId = null;
-        this.clipboardInterval = 250;
-        this.clipboardPreviousText = null;
 
         this.apiForwarder = new BackendApiForwarder();
     }
@@ -71,6 +70,8 @@ class Backend {
         this.isPreparedResolve();
         this.isPreparedResolve = null;
         this.isPreparedPromise = null;
+
+        this.clipboardMonitor.onClipboardText = (text) => this._onClipboardText(text);
     }
 
     onOptionsUpdated(source) {
@@ -101,6 +102,10 @@ class Backend {
         }
     }
 
+    _onClipboardText(text) {
+        this._onCommandSearch({mode: 'popup', query: text});
+    }
+
     _onZoomChange({tabId, oldZoomFactor, newZoomFactor}) {
         const callback = () => this.checkLastError(chrome.runtime.lastError);
         chrome.tabs.sendMessage(tabId, {action: 'zoomChanged', params: {oldZoomFactor, newZoomFactor}}, callback);
@@ -126,18 +131,10 @@ class Backend {
             this.mecab.stopListener();
         }
 
-        window.clearInterval(this.clipboardPopupTimerId);
         if (options.general.enableClipboardPopups) {
-            this.clipboardPopupTimerId = setInterval(() => {
-                this._onApiClipboardGet()
-                .then((result) => {
-                    if (this.clipboardPreviousText === result) {
-                        return;
-                    }
-                    this._onCommandSearch({mode: 'popup', query: result});
-                    this.clipboardPreviousText = result;
-                });
-            }, this.clipboardInterval);
+            this.clipboardMonitor.start();
+        } else {
+            this.clipboardMonitor.stop();
         }
     }
 
-- 
cgit v1.2.3


From 91682dd63334da7acf458a320fbd48bbf7dff766 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 26 Jan 2020 04:16:02 +0200
Subject: add permission check to formRead

---
 ext/bg/js/settings/main.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 55472a7b..cf0f08db 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -28,7 +28,22 @@ function getOptionsFullMutable() {
 
 async function formRead(options) {
     options.general.enable = $('#enable').prop('checked');
-    options.general.enableClipboardPopups = $('#enable-clipboard-popups').prop('checked');
+    const enableClipboardPopups = $('#enable-clipboard-popups').prop('checked');
+    if (enableClipboardPopups) {
+        options.general.enableClipboardPopups = await new Promise((resolve, _reject) => {
+            chrome.permissions.request(
+                {permissions: ['clipboardRead']},
+                (granted) => {
+                    if (!granted) {
+                        $('#enable-clipboard-popups').prop('checked', false);
+                    }
+                    resolve(granted);
+                }
+            );
+        });
+    } else {
+        options.general.enableClipboardPopups = false;
+    }
     options.general.showGuide = $('#show-usage-guide').prop('checked');
     options.general.compactTags = $('#compact-tags').prop('checked');
     options.general.compactGlossaries = $('#compact-glossaries').prop('checked');
-- 
cgit v1.2.3


From d7f0369281f8e9f036d87be392828e81d8187e74 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 2 Feb 2020 14:41:41 +0200
Subject: use Promise

---
 ext/bg/js/backend.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index fa1660c2..06010a95 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -630,10 +630,10 @@ class Backend {
                 if (this.popupWindow !== null) {
                     chrome.windows.remove(this.popupWindow.id);
                 }
-                chrome.windows.create(
+                this.popupWindow = await new Promise((resolve) => chrome.windows.create(
                     {url, width: popupWidth, height: popupHeight, type: 'popup'},
-                    (popupWindow) => { this.popupWindow = popupWindow; }
-                );
+                    resolve
+                ));
                 return;
         }
     }
-- 
cgit v1.2.3


From 8d56d6ffcb0f02e1edaf4193e182e95bfe7d22c5 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 2 Feb 2020 14:58:31 +0200
Subject: handle closing already closed popup

---
 ext/bg/js/backend.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 06010a95..a9f2385b 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -628,7 +628,8 @@ class Backend {
                 return;
             case 'popup':
                 if (this.popupWindow !== null) {
-                    chrome.windows.remove(this.popupWindow.id);
+                    const callback = () => this.checkLastError(chrome.runtime.lastError);
+                    chrome.windows.remove(this.popupWindow.id, callback);
                 }
                 this.popupWindow = await new Promise((resolve) => chrome.windows.create(
                     {url, width: popupWidth, height: popupHeight, type: 'popup'},
-- 
cgit v1.2.3


From c16c38638b4ce39f64add0d6e430a21e44d8ec01 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 2 Feb 2020 16:08:19 +0200
Subject: hide search input in native popups

---
 ext/bg/js/backend.js      |  6 ++++--
 ext/bg/js/search.js       | 37 ++++++++++++++++++-------------------
 ext/bg/search.html        | 34 ++++++++++++++++++----------------
 ext/mixed/css/display.css |  4 ++++
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index a9f2385b..bdb8a76a 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -603,8 +603,10 @@ class Backend {
         const {popupWidth, popupHeight} = options.general;
 
         const baseUrl = chrome.runtime.getURL('/bg/search.html');
-        const queryString = (query && query.length > 0) ? `?query=${encodeURIComponent(query)}` : '';
-        const url = baseUrl + queryString;
+        const queryParams = {mode};
+        if (query && query.length > 0) { queryParams.query = query; }
+        const queryString = new URLSearchParams(queryParams).toString();
+        const url = `${baseUrl}?${queryString}`;
 
         switch (mode) {
             case 'sameTab':
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index e32ba46e..ea4ab235 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -53,6 +53,8 @@ class DisplaySearch extends Display {
                 this.search.addEventListener('click', (e) => this.onSearch(e), false);
             }
             if (this.query !== null) {
+                const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
+                document.documentElement.dataset.searchMode = mode;
                 this.query.addEventListener('input', () => this.onSearchInput(), false);
 
                 if (this.wanakanaEnable !== null) {
@@ -63,7 +65,6 @@ class DisplaySearch extends Display {
                         this.wanakanaEnable.checked = false;
                     }
                     this.wanakanaEnable.addEventListener('change', (e) => {
-                        const query = DisplaySearch.getSearchQueryFromLocation(window.location.href) || '';
                         if (e.target.checked) {
                             window.wanakana.bind(this.query);
                             this.setQuery(window.wanakana.toKana(query));
@@ -77,15 +78,12 @@ class DisplaySearch extends Display {
                     });
                 }
 
-                const query = DisplaySearch.getSearchQueryFromLocation(window.location.href);
-                if (query !== null) {
-                    if (this.isWanakanaEnabled()) {
-                        this.setQuery(window.wanakana.toKana(query));
-                    } else {
-                        this.setQuery(query);
-                    }
-                    this.onSearchQueryUpdated(this.query.value, false);
+                if (this.isWanakanaEnabled()) {
+                    this.setQuery(window.wanakana.toKana(query));
+                } else {
+                    this.setQuery(query);
                 }
+                this.onSearchQueryUpdated(this.query.value, false);
             }
             if (this.clipboardMonitorEnable !== null) {
                 if (this.options.general.enableClipboardMonitor === true) {
@@ -162,13 +160,12 @@ class DisplaySearch extends Display {
     }
 
     onPopState() {
-        const query = DisplaySearch.getSearchQueryFromLocation(window.location.href) || '';
-        if (this.query !== null) {
-            if (this.isWanakanaEnabled()) {
-                this.setQuery(window.wanakana.toKana(query));
-            } else {
-                this.setQuery(query);
-            }
+        const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
+        document.documentElement.dataset.searchMode = mode;
+        if (this.isWanakanaEnabled()) {
+            this.setQuery(window.wanakana.toKana(query));
+        } else {
+            this.setQuery(query);
         }
 
         this.onSearchQueryUpdated(this.query.value, false);
@@ -334,9 +331,11 @@ class DisplaySearch extends Display {
         }
     }
 
-    static getSearchQueryFromLocation(url) {
-        const match = /^[^?#]*\?(?:[^&#]*&)?query=([^&#]*)/.exec(url);
-        return match !== null ? decodeURIComponent(match[1]) : null;
+    static parseQueryStringFromLocation(url) {
+        const parsedUrl = new URL(url);
+        const parsedSearch = new URLSearchParams(parsedUrl.search);
+        return Array.from(parsedSearch.entries())
+            .reduce((a, [k, v]) => Object.assign({}, a, {[k]: v}), {});
     }
 }
 
diff --git a/ext/bg/search.html b/ext/bg/search.html
index bb555e92..10e5aa8e 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -25,23 +25,25 @@
                 <p style="margin-bottom: 0;">Search your installed dictionaries by entering a Japanese expression into the field below.</p>
             </div>
 
-            <div class="input-group" style="padding-top: 20px;">
-                <span title="Enable kana input method" class="input-group-text">
-                    <input type="checkbox" id="wanakana-enable" class="icon-checkbox" />
-                    <label for="wanakana-enable" class="scan-disable">あ</label>
-                </span>
-                <span title="Enable clipboard monitor" class="input-group-text">
-                    <input type="checkbox" id="clipboard-monitor-enable" class="icon-checkbox" />
-                    <label for="clipboard-monitor-enable"><span class="glyphicon glyphicon-paste"></span></label>
-                </span>
-            </div>
+            <div class="search-input">
+                <div class="input-group" style="padding-top: 20px;">
+                    <span title="Enable kana input method" class="input-group-text">
+                        <input type="checkbox" id="wanakana-enable" class="icon-checkbox" />
+                        <label for="wanakana-enable" class="scan-disable">あ</label>
+                    </span>
+                    <span title="Enable clipboard monitor" class="input-group-text">
+                        <input type="checkbox" id="clipboard-monitor-enable" class="icon-checkbox" />
+                        <label for="clipboard-monitor-enable"><span class="glyphicon glyphicon-paste"></span></label>
+                    </span>
+                </div>
 
-            <form class="input-group">
-                <input type="text" class="form-control" placeholder="Search for..." id="query" autofocus>
-                <span class="input-group-btn">
-                    <input type="submit" class="btn btn-default form-control" id="search" value="Search">
-                </span>
-            </form>
+                <form class="input-group">
+                    <input type="text" class="form-control" placeholder="Search for..." id="query" autofocus>
+                    <span class="input-group-btn">
+                        <input type="submit" class="btn btn-default form-control" id="search" value="Search">
+                    </span>
+                </form>
+            </div>
 
             <div id="spinner" hidden><img src="/mixed/img/spinner.gif"></div>
 
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 3a66cec3..62e62243 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -136,6 +136,10 @@ html:root[data-yomichan-page=float] .navigation-header:not([hidden])~.navigation
     margin-right: 0.2em;
 }
 
+html:root[data-yomichan-page=search][data-search-mode=popup] .search-input {
+    display: none;
+}
+
 
 /*
  * Entries
-- 
cgit v1.2.3


From 8a295c4bb06b88bb135a34a3f692ac631a713f50 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Wed, 5 Feb 2020 01:41:57 +0200
Subject: fix constant usage from wrong scope

---
 ext/bg/js/search.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index ea4ab235..34dac15b 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -65,6 +65,7 @@ class DisplaySearch extends Display {
                         this.wanakanaEnable.checked = false;
                     }
                     this.wanakanaEnable.addEventListener('change', (e) => {
+                        const {query=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
                         if (e.target.checked) {
                             window.wanakana.bind(this.query);
                             this.setQuery(window.wanakana.toKana(query));
-- 
cgit v1.2.3


From 722a2a4bce08ae2e69d7abb1c5d09842bd29ebfa Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Wed, 5 Feb 2020 13:26:25 +0200
Subject: disable internal clipboard monitor in native popup

---
 ext/bg/js/search.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 34dac15b..feadefe4 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -49,11 +49,12 @@ class DisplaySearch extends Display {
         try {
             await this.initialize();
 
+            const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
+
             if (this.search !== null) {
                 this.search.addEventListener('click', (e) => this.onSearch(e), false);
             }
             if (this.query !== null) {
-                const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
                 document.documentElement.dataset.searchMode = mode;
                 this.query.addEventListener('input', () => this.onSearchInput(), false);
 
@@ -86,7 +87,7 @@ class DisplaySearch extends Display {
                 }
                 this.onSearchQueryUpdated(this.query.value, false);
             }
-            if (this.clipboardMonitorEnable !== null) {
+            if (this.clipboardMonitorEnable !== null && mode !== 'popup') {
                 if (this.options.general.enableClipboardMonitor === true) {
                     this.clipboardMonitorEnable.checked = true;
                     this.clipboardMonitor.start();
-- 
cgit v1.2.3


From 9fbd47e4eaeee2f1121cdeae08dbc5439b247498 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 9 Feb 2020 21:06:59 +0200
Subject: rename sameTab --> existingOrNewTab

---
 ext/bg/js/backend.js | 4 ++--
 ext/bg/js/context.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index bdb8a76a..f94463aa 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -597,7 +597,7 @@ class Backend {
     // Command handlers
 
     async _onCommandSearch(params) {
-        const {mode, query} = params || {mode: 'sameTab'};
+        const {mode, query} = params || {mode: 'existingOrNewTab'};
 
         const options = await this.getOptions(this.optionsContext);
         const {popupWidth, popupHeight} = options.general;
@@ -609,7 +609,7 @@ class Backend {
         const url = `${baseUrl}?${queryString}`;
 
         switch (mode) {
-            case 'sameTab':
+            case 'existingOrNewTab':
                 try {
                     const tab = await Backend._findTab(1000, (url2) => (
                         url2 !== null &&
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
index a0e5adc9..37adb6b7 100644
--- a/ext/bg/js/context.js
+++ b/ext/bg/js/context.js
@@ -30,7 +30,7 @@ function setupButtonEvents(selector, command, url) {
     for (const node of nodes) {
         node.addEventListener('click', (e) => {
             if (e.button !== 0) { return; }
-            apiCommandExec(command, {mode: e.ctrlKey ? 'newTab' : 'sameTab'});
+            apiCommandExec(command, {mode: e.ctrlKey ? 'newTab' : 'existingOrNewTab'});
             e.preventDefault();
         }, false);
         node.addEventListener('auxclick', (e) => {
-- 
cgit v1.2.3


From 1797edc7d88f63872c3a593179d9dd5c7b3c0b47 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 9 Feb 2020 21:11:35 +0200
Subject: check chrome.windows support before using

---
 ext/bg/js/backend.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index f94463aa..6d23b695 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -629,6 +629,10 @@ class Backend {
                 chrome.tabs.create({url});
                 return;
             case 'popup':
+                if (!isObject(chrome.windows)) {
+                    // chrome.windows not supported (e.g. on Firefox mobile)
+                    return;
+                }
                 if (this.popupWindow !== null) {
                     const callback = () => this.checkLastError(chrome.runtime.lastError);
                     chrome.windows.remove(this.popupWindow.id, callback);
-- 
cgit v1.2.3


From 4e59c2d55684b5a0b1d9edc580dd4c43bfc46211 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 9 Feb 2020 21:28:40 +0200
Subject: hide native popup option for firefox mobile

---
 ext/bg/css/settings.css | 14 ++++++++++++++
 ext/bg/settings.html    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css
index 815a88fa..d686e8f8 100644
--- a/ext/bg/css/settings.css
+++ b/ext/bg/css/settings.css
@@ -222,6 +222,20 @@ html:root[data-operating-system=openbsd] [data-show-for-operating-system~=openbs
     display: initial;
 }
 
+html:root[data-browser=edge] [data-hide-for-browser~=edge],
+html:root[data-browser=chrome] [data-hide-for-browser~=chrome],
+html:root[data-browser=firefox] [data-hide-for-browser~=firefox],
+html:root[data-browser=firefox-mobile] [data-hide-for-browser~=firefox-mobile],
+html:root[data-operating-system=mac] [data-hide-for-operating-system~=mac],
+html:root[data-operating-system=win] [data-hide-for-operating-system~=win],
+html:root[data-operating-system=android] [data-hide-for-operating-system~=android],
+html:root[data-operating-system=cros] [data-hide-for-operating-system~=cros],
+html:root[data-operating-system=linux] [data-hide-for-operating-system~=linux],
+html:root[data-operating-system=openbsd] [data-hide-for-operating-system~=openbsd] {
+    display: none;
+}
+
+
 @media screen and (max-width: 740px) {
     .col-xs-6 {
         float: none;
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index b0fcec2b..57616873 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -134,7 +134,7 @@
                     <label><input type="checkbox" id="enable"> Enable content scanning</label>
                 </div>
 
-                <div class="checkbox">
+                <div class="checkbox" data-hide-for-browser="firefox-mobile">
                     <label><input type="checkbox" id="enable-clipboard-popups"> Enable native popups when copying Japanese text</label>
                 </div>
 
-- 
cgit v1.2.3


From 21bad6c6e380c9c0dbd03f82563a1570bf22963c Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 9 Feb 2020 21:47:11 +0200
Subject: simplify setQuery kana conversion

---
 ext/bg/js/search.js | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index feadefe4..1baee904 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -69,22 +69,17 @@ class DisplaySearch extends Display {
                         const {query=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
                         if (e.target.checked) {
                             window.wanakana.bind(this.query);
-                            this.setQuery(window.wanakana.toKana(query));
                             apiOptionsSet({general: {enableWanakana: true}}, this.getOptionsContext());
                         } else {
                             window.wanakana.unbind(this.query);
-                            this.setQuery(query);
                             apiOptionsSet({general: {enableWanakana: false}}, this.getOptionsContext());
                         }
+                        this.setQuery(query);
                         this.onSearchQueryUpdated(this.query.value, false);
                     });
                 }
 
-                if (this.isWanakanaEnabled()) {
-                    this.setQuery(window.wanakana.toKana(query));
-                } else {
-                    this.setQuery(query);
-                }
+                this.setQuery(query);
                 this.onSearchQueryUpdated(this.query.value, false);
             }
             if (this.clipboardMonitorEnable !== null && mode !== 'popup') {
@@ -164,12 +159,7 @@ class DisplaySearch extends Display {
     onPopState() {
         const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
         document.documentElement.dataset.searchMode = mode;
-        if (this.isWanakanaEnabled()) {
-            this.setQuery(window.wanakana.toKana(query));
-        } else {
-            this.setQuery(query);
-        }
-
+        this.setQuery(query);
         this.onSearchQueryUpdated(this.query.value, false);
     }
 
@@ -203,7 +193,7 @@ class DisplaySearch extends Display {
     }
 
     onClipboardText(text) {
-        this.setQuery(this.isWanakanaEnabled() ? window.wanakana.toKana(text) : text);
+        this.setQuery(text);
         window.history.pushState(null, '', `${window.location.pathname}?query=${encodeURIComponent(text)}`);
         this.onSearchQueryUpdated(this.query.value, true);
     }
@@ -256,8 +246,9 @@ class DisplaySearch extends Display {
     }
 
     setQuery(query) {
-        this.query.value = query;
-        this.queryParser.setText(query);
+        const interpretedQuery = this.isWanakanaEnabled() ? window.wanakana.toKana(query) : query;
+        this.query.value = interpretedQuery;
+        this.queryParser.setText(interpretedQuery);
     }
 
     setIntroVisible(visible, animate) {
-- 
cgit v1.2.3


From d4e74a05723b1b4347c51606bcee61dc72e34e51 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 9 Feb 2020 22:16:52 +0200
Subject: fix existing tab focus

---
 ext/bg/js/backend.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 6d23b695..9eb1d9ca 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -597,7 +597,7 @@ class Backend {
     // Command handlers
 
     async _onCommandSearch(params) {
-        const {mode, query} = params || {mode: 'existingOrNewTab'};
+        const {mode='existingOrNewTab', query} = params || {};
 
         const options = await this.getOptions(this.optionsContext);
         const {popupWidth, popupHeight} = options.general;
@@ -613,11 +613,14 @@ class Backend {
                 try {
                     const tab = await Backend._findTab(1000, (url2) => (
                         url2 !== null &&
-                        url2.startsWith(url) &&
-                        (url2.length === url.length || url2[url.length] === '?' || url2[url.length] === '#')
+                        url2.startsWith(baseUrl) &&
+                        (url2.length === baseUrl.length || url2[baseUrl.length] === '?' || url2[baseUrl.length] === '#')
                     ));
                     if (tab !== null) {
                         await Backend._focusTab(tab);
+                        if (queryParams.query) {
+                            await new Promise((resolve) => chrome.tabs.update(tab.id, {url}, resolve));
+                        }
                         return;
                     }
                 } catch (e) {
-- 
cgit v1.2.3


From 4508efb9a695a97f19cf99ccb6155c55f9be5f0d Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 9 Feb 2020 22:41:20 +0200
Subject: stop clipboard monitor before starting it again

---
 ext/bg/js/clipboard-monitor.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/bg/js/clipboard-monitor.js b/ext/bg/js/clipboard-monitor.js
index 579cdc56..b4a27fa2 100644
--- a/ext/bg/js/clipboard-monitor.js
+++ b/ext/bg/js/clipboard-monitor.js
@@ -30,6 +30,8 @@ class ClipboardMonitor {
     }
 
     start() {
+        this.stop();
+
         // The token below is used as a unique identifier to ensure that a new clipboard monitor
         // hasn't been started during the await call. The check below the await apiClipboardGet()
         // call will exit early if the reference has changed.
-- 
cgit v1.2.3


From 56f1f8384dba7da6f1373768129bd37c24147520 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 10 Feb 2020 00:09:29 +0200
Subject: use parseUrl in Backend

---
 ext/bg/js/backend.js | 12 +++++++-----
 ext/bg/js/search.js  | 13 +++----------
 ext/mixed/js/core.js |  8 ++++++++
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 9eb1d9ca..9565a8d9 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -608,14 +608,16 @@ class Backend {
         const queryString = new URLSearchParams(queryParams).toString();
         const url = `${baseUrl}?${queryString}`;
 
+        const isTabMatch = (url2) => {
+            if (url2 === null || !url2.startsWith(baseUrl)) { return false; }
+            const {baseUrl: baseUrl2, queryParams: queryParams2} = parseUrl(url2);
+            return baseUrl2 === baseUrl && (queryParams2.mode === mode || (!queryParams2.mode && mode === 'existingOrNewTab'));
+        };
+
         switch (mode) {
             case 'existingOrNewTab':
                 try {
-                    const tab = await Backend._findTab(1000, (url2) => (
-                        url2 !== null &&
-                        url2.startsWith(baseUrl) &&
-                        (url2.length === baseUrl.length || url2[baseUrl.length] === '?' || url2[baseUrl.length] === '#')
-                    ));
+                    const tab = await Backend._findTab(1000, isTabMatch);
                     if (tab !== null) {
                         await Backend._focusTab(tab);
                         if (queryParams.query) {
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 1baee904..b6a1e66a 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -49,7 +49,7 @@ class DisplaySearch extends Display {
         try {
             await this.initialize();
 
-            const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
+            const {queryParams: {query='', mode=''}} = parseUrl(window.location.href);
 
             if (this.search !== null) {
                 this.search.addEventListener('click', (e) => this.onSearch(e), false);
@@ -66,7 +66,7 @@ class DisplaySearch extends Display {
                         this.wanakanaEnable.checked = false;
                     }
                     this.wanakanaEnable.addEventListener('change', (e) => {
-                        const {query=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
+                        const {queryParams: {query=''}} = parseUrl(window.location.href);
                         if (e.target.checked) {
                             window.wanakana.bind(this.query);
                             apiOptionsSet({general: {enableWanakana: true}}, this.getOptionsContext());
@@ -157,7 +157,7 @@ class DisplaySearch extends Display {
     }
 
     onPopState() {
-        const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
+        const {queryParams: {query='', mode=''}} = parseUrl(window.location.href);
         document.documentElement.dataset.searchMode = mode;
         this.setQuery(query);
         this.onSearchQueryUpdated(this.query.value, false);
@@ -323,13 +323,6 @@ class DisplaySearch extends Display {
             document.title = `${text} - Yomichan Search`;
         }
     }
-
-    static parseQueryStringFromLocation(url) {
-        const parsedUrl = new URL(url);
-        const parsedSearch = new URLSearchParams(parsedUrl.search);
-        return Array.from(parsedSearch.entries())
-            .reduce((a, [k, v]) => Object.assign({}, a, {[k]: v}), {});
-    }
 }
 
 DisplaySearch.onKeyDownIgnoreKeys = {
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index 0142d594..ca9e98e5 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -128,6 +128,14 @@ function stringReverse(string) {
     return string.split('').reverse().join('').replace(/([\uDC00-\uDFFF])([\uD800-\uDBFF])/g, '$2$1');
 }
 
+function parseUrl(url) {
+    const parsedUrl = new URL(url);
+    const baseUrl = `${parsedUrl.origin}${parsedUrl.pathname}`;
+    const queryParams = Array.from(parsedUrl.searchParams.entries())
+        .reduce((a, [k, v]) => Object.assign({}, a, {[k]: v}), {});
+    return {baseUrl, queryParams};
+}
+
 
 /*
  * Async utilities
-- 
cgit v1.2.3


From 89729d8c20e8d1113e640a46f448a9734da1fe56 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 10 Feb 2020 00:39:05 +0200
Subject: reuse existing popup window

---
 ext/bg/js/backend.js | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 9565a8d9..adfb4f10 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -614,17 +614,21 @@ class Backend {
             return baseUrl2 === baseUrl && (queryParams2.mode === mode || (!queryParams2.mode && mode === 'existingOrNewTab'));
         };
 
+        const openInTab = async () => {
+            const tab = await Backend._findTab(1000, isTabMatch);
+            if (tab !== null) {
+                await Backend._focusTab(tab);
+                if (queryParams.query) {
+                    await new Promise((resolve) => chrome.tabs.update(tab.id, {url}, resolve));
+                }
+                return true;
+            }
+        };
+
         switch (mode) {
             case 'existingOrNewTab':
                 try {
-                    const tab = await Backend._findTab(1000, isTabMatch);
-                    if (tab !== null) {
-                        await Backend._focusTab(tab);
-                        if (queryParams.query) {
-                            await new Promise((resolve) => chrome.tabs.update(tab.id, {url}, resolve));
-                        }
-                        return;
-                    }
+                    if (await openInTab()) { return; }
                 } catch (e) {
                     // NOP
                 }
@@ -634,18 +638,23 @@ class Backend {
                 chrome.tabs.create({url});
                 return;
             case 'popup':
-                if (!isObject(chrome.windows)) {
+                try {
                     // chrome.windows not supported (e.g. on Firefox mobile)
-                    return;
-                }
-                if (this.popupWindow !== null) {
-                    const callback = () => this.checkLastError(chrome.runtime.lastError);
-                    chrome.windows.remove(this.popupWindow.id, callback);
+                    if (!isObject(chrome.windows)) { return; }
+                    if (await openInTab()) { return; }
+                    // if the previous popup is open in an invalid state, close it
+                    if (this.popupWindow !== null) {
+                        const callback = () => this.checkLastError(chrome.runtime.lastError);
+                        chrome.windows.remove(this.popupWindow.id, callback);
+                    }
+                    // open new popup
+                    this.popupWindow = await new Promise((resolve) => chrome.windows.create(
+                        {url, width: popupWidth, height: popupHeight, type: 'popup'},
+                        resolve
+                    ));
+                } catch (e) {
+                    // NOP
                 }
-                this.popupWindow = await new Promise((resolve) => chrome.windows.create(
-                    {url, width: popupWidth, height: popupHeight, type: 'popup'},
-                    resolve
-                ));
                 return;
         }
     }
-- 
cgit v1.2.3


From 460d306f60fa745368c8249e4bc4bdb0d0448f25 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 10 Feb 2020 01:16:06 +0200
Subject: update popup search with chrome.tabs.sendMessage

---
 ext/bg/js/backend.js |  4 +++-
 ext/bg/js/search.js  | 23 ++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index adfb4f10..668d1fb7 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -619,7 +619,9 @@ class Backend {
             if (tab !== null) {
                 await Backend._focusTab(tab);
                 if (queryParams.query) {
-                    await new Promise((resolve) => chrome.tabs.update(tab.id, {url}, resolve));
+                    await new Promise((resolve) => chrome.tabs.sendMessage(
+                        tab.id, {action: 'searchQueryUpdate', params: {query: queryParams.query}}, resolve
+                    ));
                 }
                 return true;
             }
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index b6a1e66a..37c96934 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -109,10 +109,12 @@ class DisplaySearch extends Display {
                 });
             }
 
+            chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this));
+
             window.addEventListener('popstate', (e) => this.onPopState(e));
             window.addEventListener('copy', (e) => this.onCopy(e));
 
-            this.clipboardMonitor.onClipboardText = (text) => this.onClipboardText(text);
+            this.clipboardMonitor.onClipboardText = (text) => this.onExternalSearchUpdate(text);
 
             this.updateSearchButton();
         } catch (e) {
@@ -163,6 +165,15 @@ class DisplaySearch extends Display {
         this.onSearchQueryUpdated(this.query.value, false);
     }
 
+    onRuntimeMessage({action, params}, sender, callback) {
+        const handler = DisplaySearch._runtimeMessageHandlers.get(action);
+        if (typeof handler !== 'function') { return false; }
+
+        const result = handler(this, params, sender);
+        callback(result);
+        return false;
+    }
+
     onKeyDown(e) {
         const key = Display.getKeyFromEvent(e);
         const ignoreKeys = DisplaySearch.onKeyDownIgnoreKeys;
@@ -192,9 +203,11 @@ class DisplaySearch extends Display {
         this.clipboardMonitor.setPreviousText(document.getSelection().toString().trim());
     }
 
-    onClipboardText(text) {
+    onExternalSearchUpdate(text) {
         this.setQuery(text);
-        window.history.pushState(null, '', `${window.location.pathname}?query=${encodeURIComponent(text)}`);
+        const url = new URL(window.location.href);
+        url.searchParams.set('query', text);
+        window.history.pushState(null, '', url.toString());
         this.onSearchQueryUpdated(this.query.value, true);
     }
 
@@ -340,4 +353,8 @@ DisplaySearch.onKeyDownIgnoreKeys = {
     'Shift': []
 };
 
+DisplaySearch._runtimeMessageHandlers = new Map([
+    ['searchQueryUpdate', (self, {query}) => { self.onExternalSearchUpdate(query); }]
+]);
+
 DisplaySearch.instance = DisplaySearch.create();
-- 
cgit v1.2.3


From 14b9f4a82781b9a5044e22437f6b0b02af67a120 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 10 Feb 2020 01:31:47 +0200
Subject: preserve search page mode on manual search

---
 ext/bg/js/search.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 37c96934..4da27513 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -152,9 +152,13 @@ class DisplaySearch extends Display {
         e.preventDefault();
 
         const query = this.query.value;
+
         this.queryParser.setText(query);
-        const queryString = query.length > 0 ? `?query=${encodeURIComponent(query)}` : '';
-        window.history.pushState(null, '', `${window.location.pathname}${queryString}`);
+
+        const url = new URL(window.location.href);
+        url.searchParams.set('query', query);
+        window.history.pushState(null, '', url.toString());
+
         this.onSearchQueryUpdated(query, true);
     }
 
-- 
cgit v1.2.3


From 6c63a17d669b57fdbc1a5a71daf89c6c95e7d5ef Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 6 Feb 2020 04:00:02 +0200
Subject: query parser html templates

---
 build_tmpl.sh                              |  2 -
 build_tmpl_auto.sh                         | 16 ------
 ext/bg/background.html                     |  1 -
 ext/bg/js/api.js                           |  4 ++
 ext/bg/js/backend.js                       |  6 +++
 ext/bg/js/search-query-parser-generator.js | 78 ++++++++++++++++++++++++++++++
 ext/bg/js/search-query-parser.js           | 60 +++++++----------------
 ext/bg/js/templates.js                     | 55 ---------------------
 ext/bg/query-parser-templates.html         | 12 +++++
 ext/bg/search.html                         |  7 +--
 ext/bg/settings.html                       |  1 -
 ext/mixed/css/display.css                  |  4 +-
 ext/mixed/js/api.js                        |  4 ++
 ext/mixed/js/template-handler.js           | 53 ++++++++++++++++++++
 tmpl/query-parser.html                     | 27 -----------
 15 files changed, 180 insertions(+), 150 deletions(-)
 delete mode 100755 build_tmpl.sh
 delete mode 100755 build_tmpl_auto.sh
 create mode 100644 ext/bg/js/search-query-parser-generator.js
 delete mode 100644 ext/bg/js/templates.js
 create mode 100644 ext/bg/query-parser-templates.html
 create mode 100644 ext/mixed/js/template-handler.js
 delete mode 100644 tmpl/query-parser.html

diff --git a/build_tmpl.sh b/build_tmpl.sh
deleted file mode 100755
index e91f8de8..00000000
--- a/build_tmpl.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-handlebars tmpl/*.html -f ext/bg/js/templates.js
diff --git a/build_tmpl_auto.sh b/build_tmpl_auto.sh
deleted file mode 100755
index 98065cb7..00000000
--- a/build_tmpl_auto.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-DIRECTORY_TO_OBSERVE="tmpl"
-BUILD_SCRIPT="build_tmpl.sh"
-
-function block_for_change {
-    inotifywait -e modify,move,create,delete $DIRECTORY_TO_OBSERVE
-}
-
-function build {
-    bash $BUILD_SCRIPT
-}
-
-build
-while block_for_change; do
-  build
-done
diff --git a/ext/bg/background.html b/ext/bg/background.html
index 11023221..7fd1c477 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -37,7 +37,6 @@
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/profile-conditions.js"></script>
         <script src="/bg/js/request.js"></script>
-        <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/translator.js"></script>
         <script src="/bg/js/util.js"></script>
         <script src="/mixed/js/audio.js"></script>
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index f4be7a0c..cd6a9d18 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -33,6 +33,10 @@ function apiClipboardGet() {
     return _apiInvoke('clipboardGet');
 }
 
+function apiGetQueryParserTemplatesHtml() {
+    return _apiInvoke('getQueryParserTemplatesHtml');
+}
+
 function _apiInvoke(action, params={}) {
     const data = {action, params};
     return new Promise((resolve, reject) => {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 668d1fb7..529055d2 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -567,6 +567,11 @@ class Backend {
         return await requestText(url, 'GET');
     }
 
+    async _onApiGetQueryParserTemplatesHtml() {
+        const url = chrome.runtime.getURL('/bg/query-parser-templates.html');
+        return await requestText(url, 'GET');
+    }
+
     _onApiGetZoom(params, sender) {
         if (!sender || !sender.tab) {
             return Promise.reject(new Error('Invalid tab'));
@@ -854,6 +859,7 @@ Backend._messageHandlers = new Map([
     ['getEnvironmentInfo', (self, ...args) => self._onApiGetEnvironmentInfo(...args)],
     ['clipboardGet', (self, ...args) => self._onApiClipboardGet(...args)],
     ['getDisplayTemplatesHtml', (self, ...args) => self._onApiGetDisplayTemplatesHtml(...args)],
+    ['getQueryParserTemplatesHtml', (self, ...args) => self._onApiGetQueryParserTemplatesHtml(...args)],
     ['getZoom', (self, ...args) => self._onApiGetZoom(...args)]
 ]);
 
diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js
new file mode 100644
index 00000000..67a1ccad
--- /dev/null
+++ b/ext/bg/js/search-query-parser-generator.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+class QueryParserGenerator {
+    constructor() {
+        this._templateHandler = null;
+        this._initialize();
+    }
+
+    async _initialize() {
+        const html = await apiGetQueryParserTemplatesHtml();
+        this._templateHandler = new TemplateHandler(html);
+    }
+
+    createParseResult(terms, preview=false) {
+        const fragment = document.createDocumentFragment();
+        for (const term of terms) {
+            const termContainer = this._templateHandler.instantiate(preview ? 'term-preview' : 'term');
+            for (const segment of term) {
+                if (!segment.text.trim()) { continue; }
+                if (!segment.reading || !segment.reading.trim()) {
+                    termContainer.appendChild(this.createSegmentText(segment.text));
+                } else {
+                    termContainer.appendChild(this.createSegment(segment));
+                }
+            }
+            fragment.appendChild(termContainer);
+        }
+        return fragment;
+    }
+
+    createSegment(segment) {
+        const segmentContainer = this._templateHandler.instantiate('segment');
+        const segmentTextContainer = segmentContainer.querySelector('.query-parser-segment-text');
+        const segmentReadingContainer = segmentContainer.querySelector('.query-parser-segment-reading');
+        segmentTextContainer.appendChild(this.createSegmentText(segment.text));
+        segmentReadingContainer.innerText = segment.reading;
+        return segmentContainer;
+    }
+
+    createSegmentText(text) {
+        const fragment = document.createDocumentFragment();
+        for (const chr of text) {
+            const charContainer = this._templateHandler.instantiate('char');
+            charContainer.innerText = chr;
+            fragment.appendChild(charContainer);
+        }
+        return fragment;
+    }
+
+    createParserSelect(parseResults, selectedParser) {
+        const selectContainer = this._templateHandler.instantiate('select');
+        for (const parseResult of parseResults) {
+            const optionContainer = this._templateHandler.instantiate('select-option');
+            optionContainer.value = parseResult.id;
+            optionContainer.innerText = parseResult.name;
+            optionContainer.defaultSelected = selectedParser === parseResult.id;
+            selectContainer.appendChild(optionContainer);
+        }
+        return selectContainer;
+    }
+}
diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index e8e6d11f..3a93c7e7 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -19,14 +19,16 @@
 
 class QueryParser extends TextScanner {
     constructor(search) {
-        super(document.querySelector('#query-parser'), [], [], []);
+        super(document.querySelector('#query-parser-content'), [], [], []);
         this.search = search;
 
         this.parseResults = [];
         this.selectedParser = null;
 
-        this.queryParser = document.querySelector('#query-parser');
-        this.queryParserSelect = document.querySelector('#query-parser-select');
+        this.queryParser = document.querySelector('#query-parser-content');
+        this.queryParserSelect = document.querySelector('#query-parser-select-container');
+
+        this.queryParserGenerator = new QueryParserGenerator();
     }
 
     onError(error) {
@@ -64,7 +66,7 @@ class QueryParser extends TextScanner {
         const selectedParser = e.target.value;
         this.selectedParser = selectedParser;
         apiOptionsSet({parsing: {selectedParser}}, this.search.getOptionsContext());
-        this.renderParseResult(this.getParseResult());
+        this.renderParseResult();
     }
 
     getMouseEventListeners() {
@@ -113,13 +115,13 @@ class QueryParser extends TextScanner {
     async setText(text) {
         this.search.setSpinnerVisible(true);
 
-        await this.setPreview(text);
+        this.setPreview(text);
 
         this.parseResults = await this.parseText(text);
         this.refreshSelectedParser();
 
         this.renderParserSelect();
-        await this.renderParseResult();
+        this.renderParseResult();
 
         this.search.setSpinnerVisible(false);
     }
@@ -146,57 +148,29 @@ class QueryParser extends TextScanner {
         return results;
     }
 
-    async setPreview(text) {
+    setPreview(text) {
         const previewTerms = [];
         for (let i = 0, ii = text.length; i < ii; i += 2) {
             const tempText = text.substring(i, i + 2);
-            previewTerms.push([{text: tempText.split('')}]);
+            previewTerms.push([{text: tempText}]);
         }
-        this.queryParser.innerHTML = await apiTemplateRender('query-parser.html', {
-            terms: previewTerms,
-            preview: true
-        });
+        this.queryParser.textContent = '';
+        this.queryParser.appendChild(this.queryParserGenerator.createParseResult(previewTerms, true));
     }
 
     renderParserSelect() {
         this.queryParserSelect.innerHTML = '';
         if (this.parseResults.length > 1) {
-            const select = document.createElement('select');
-            select.classList.add('form-control');
-            for (const parseResult of this.parseResults) {
-                const option = document.createElement('option');
-                option.value = parseResult.id;
-                option.innerText = parseResult.name;
-                option.defaultSelected = this.selectedParser === parseResult.id;
-                select.appendChild(option);
-            }
+            const select = this.queryParserGenerator.createParserSelect(this.parseResults, this.selectedParser);
             select.addEventListener('change', this.onParserChange.bind(this));
             this.queryParserSelect.appendChild(select);
         }
     }
 
-    async renderParseResult() {
+    renderParseResult() {
         const parseResult = this.getParseResult();
-        if (!parseResult) {
-            this.queryParser.innerHTML = '';
-            return;
-        }
-
-        this.queryParser.innerHTML = await apiTemplateRender(
-            'query-parser.html',
-            {terms: QueryParser.processParseResultForDisplay(parseResult.parsedText)}
-        );
-    }
-
-    static processParseResultForDisplay(result) {
-        return result.map((term) => {
-            return term.filter((part) => part.text.trim()).map((part) => {
-                return {
-                    text: part.text.split(''),
-                    reading: part.reading,
-                    raw: !part.reading || !part.reading.trim()
-                };
-            });
-        });
+        this.queryParser.textContent = '';
+        if (!parseResult) { return; }
+        this.queryParser.appendChild(this.queryParserGenerator.createParseResult(parseResult.parsedText));
     }
 }
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
deleted file mode 100644
index 2f65be31..00000000
--- a/ext/bg/js/templates.js
+++ /dev/null
@@ -1,55 +0,0 @@
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['query-parser.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
-
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.preview : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers.each.call(alias1,depth0,{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</span>";
-},"2":function(container,depth0,helpers,partials,data) {
-    return "<span class=\"query-parser-term-preview\">";
-},"4":function(container,depth0,helpers,partials,data) {
-    return "<span class=\"query-parser-term\">";
-},"6":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials.part,depth0,{"name":"part","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"8":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.raw : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
-},"9":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.text : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"10":function(container,depth0,helpers,partials,data) {
-    return "<span class=\"query-parser-char\">"
-    + container.escapeExpression(container.lambda(depth0, depth0))
-    + "</span>";
-},"12":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
-
-  return "<ruby>"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.text : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "<rt>"
-    + container.escapeExpression(((helper = (helper = helpers.reading || (depth0 != null ? depth0.reading : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"reading","hash":{},"data":data}) : helper)))
-    + "</rt></ruby>";
-},"14":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"preview":(depths[1] != null ? depths[1].preview : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.terms : depth0),{"name":"each","hash":{},"fn":container.program(14, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
-
-  var decorators = container.decorators;
-
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"args":["term"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(8, data, 0, blockParams, depths),"inverse":container.noop,"args":["part"],"data":data}) || fn;
-  return fn;
-  }
-
-,"useDecorators":true,"usePartial":true,"useData":true,"useDepths":true});
-})();
\ No newline at end of file
diff --git a/ext/bg/query-parser-templates.html b/ext/bg/query-parser-templates.html
new file mode 100644
index 00000000..f7f6d76c
--- /dev/null
+++ b/ext/bg/query-parser-templates.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html><html><head></head><body>
+
+<template id="term-template"><span class="query-parser-term" data-type="normal"></span></template>
+<template id="term-preview-template"><span class="query-parser-term" data-type="preview"></span></template>
+<template id="segment-template"><ruby class="query-parser-segment"><span class="query-parser-segment-text"></span><rt class="query-parser-segment-reading"></rt></ruby></template>
+<template id="char-template"><span class="query-parser-char"></span></template>
+
+<template id="select-template"><select class="query-parser-select form-control">
+</select></template>
+<template id="select-option-template"><option class="query-parser-select-option"></option></template>
+
+</body></html>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 10e5aa8e..d6336826 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -48,8 +48,8 @@
             <div id="spinner" hidden><img src="/mixed/img/spinner.gif"></div>
 
             <div class="scan-disable">
-                <div id="query-parser-select" class="input-group"></div>
-                <div id="query-parser"></div>
+                <div id="query-parser-select-container" class="input-group"></div>
+                <div id="query-parser-content"></div>
             </div>
 
             <hr>
@@ -78,7 +78,6 @@
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/japanese.js"></script>
-        <script src="/bg/js/templates.js"></script>
         <script src="/fg/js/document.js"></script>
         <script src="/fg/js/source.js"></script>
         <script src="/mixed/js/audio.js"></script>
@@ -87,7 +86,9 @@
         <script src="/mixed/js/display-generator.js"></script>
         <script src="/mixed/js/scroll.js"></script>
         <script src="/mixed/js/text-scanner.js"></script>
+        <script src="/mixed/js/template-handler.js"></script>
 
+        <script src="/bg/js/search-query-parser-generator.js"></script>
         <script src="/bg/js/search-query-parser.js"></script>
         <script src="/bg/js/clipboard-monitor.js"></script>
         <script src="/bg/js/search.js"></script>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 57616873..b048a36c 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -1097,7 +1097,6 @@
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/page-exit-prevention.js"></script>
         <script src="/bg/js/profile-conditions.js"></script>
-        <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
         <script src="/mixed/js/audio.js"></script>
 
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 62e62243..2714de72 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -127,12 +127,12 @@ html:root[data-yomichan-page=float] .navigation-header:not([hidden])~.navigation
     user-select: none;
 }
 
-#query-parser {
+#query-parser-content {
     margin-top: 0.5em;
     font-size: 2em;
 }
 
-#query-parser[data-term-spacing=true] .query-parser-term {
+#query-parser-content[data-term-spacing=true] .query-parser-term {
     margin-right: 0.2em;
 }
 
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 5ec93b01..0b1e7e4f 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -105,6 +105,10 @@ function apiGetDisplayTemplatesHtml() {
     return _apiInvoke('getDisplayTemplatesHtml');
 }
 
+function apiGetQueryParserTemplatesHtml() {
+    return _apiInvoke('getQueryParserTemplatesHtml');
+}
+
 function apiGetZoom() {
     return _apiInvoke('getZoom');
 }
diff --git a/ext/mixed/js/template-handler.js b/ext/mixed/js/template-handler.js
new file mode 100644
index 00000000..86e2414f
--- /dev/null
+++ b/ext/mixed/js/template-handler.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+class TemplateHandler {
+    constructor(html) {
+        this._templates = new Map();
+        this._html = html;
+        this._doc = null;
+
+        this._initialize();
+    }
+
+    _initialize() {
+        this._doc = new DOMParser().parseFromString(this._html, 'text/html');
+        for (const template of this._doc.querySelectorAll('template')) {
+            this._setTemplate(template);
+        }
+    }
+
+    _setTemplate(template) {
+        const idMatch = template.id.match(/^([a-z-]+)-template$/);
+        if (!idMatch) {
+            throw new Error(`Invalid template ID: ${template.id}`);
+        }
+        this._templates.set(idMatch[1], template);
+    }
+
+    instantiate(name) {
+        const template = this._templates.get(name);
+        return document.importNode(template.content.firstChild, true);
+    }
+
+    instantiateFragment(name) {
+        const template = this._templates.get(name);
+        return document.importNode(template.content, true);
+    }
+}
diff --git a/tmpl/query-parser.html b/tmpl/query-parser.html
deleted file mode 100644
index db98b5ff..00000000
--- a/tmpl/query-parser.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{{~#*inline "term"~}}
-{{~#if preview~}}
-<span class="query-parser-term-preview">
-{{~else~}}
-<span class="query-parser-term">
-{{~/if~}}
-{{~#each this~}}
-{{> part }}
-{{~/each~}}
-</span>
-{{~/inline~}}
-
-{{~#*inline "part"~}}
-{{~#if raw~}}
-{{~#each text~}}
-<span class="query-parser-char">{{this}}</span>
-{{~/each~}}
-{{~else~}}
-<ruby>{{~#each text~}}
-<span class="query-parser-char">{{this}}</span>
-{{~/each~}}<rt>{{reading}}</rt></ruby>
-{{~/if~}}
-{{~/inline~}}
-
-{{~#each terms~}}
-{{> term preview=../preview }}
-{{~/each~}}
-- 
cgit v1.2.3


From 3ba2dcf7e6b993b2fd216f252b9bc32ba3f429be Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 6 Feb 2020 04:15:59 +0200
Subject: remove README for templates in development

---
 README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/README.md b/README.md
index 7b25b852..631f5a8b 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ Yomichan provides advanced features not available in other browser-based diction
     *   [Flashcard Creation](https://foosoft.net/projects/yomichan/#flashcard-creation)
 *   [Keyboard Shortcuts](https://foosoft.net/projects/yomichan/#keyboard-shortcuts)
 *   [Development](https://foosoft.net/projects/yomichan/#development)
-    *   [Templates](https://foosoft.net/projects/yomichan/#templates)
     *   [Dependencies](https://foosoft.net/projects/yomichan/#dependencies)
 *   [Frequently Asked Questions](https://foosoft.net/projects/yomichan/#frequently-asked-questions)
 *   [Screenshots](https://foosoft.net/projects/yomichan/#screenshots)
@@ -241,15 +240,6 @@ following basic guidelines when creating pull requests:
 *   Large pull requests without a clear scope will not be merged.
 *   Incomplete or non-standalone features will not be merged.
 
-### Templates ###
-
-Yomichan uses [Handlebars](https://handlebarsjs.com/) templates for user interface generation. The source templates are
-found in the `tmpl` directory and the compiled version is stored in the `ext/bg/js/templates.js` file. If you modify the
-source templates, you will need to also recompile them. If you are developing on Linux or Mac OS X, you can use the
-included `build_tmpl.sh` and `build_tmpl_auto.sh` shell scripts to do this for you
-([inotify-tools](https://github.com/rvoicilas/inotify-tools/wiki) required). Otherwise, simply execute `handlebars
-tmpl/*.html -f ext/bg/js/templates.js` from the project's base directory to compile all the templates.
-
 ### Dependencies ###
 
 Yomichan uses several third-party libraries to function. Below are links to homepages, snapshots, and licenses of the exact
-- 
cgit v1.2.3


From b7f347ff4f18a7f64267eb0d1ba1b84cbdfc4220 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 6 Feb 2020 04:25:45 +0200
Subject: remove newline from template

---
 ext/bg/query-parser-templates.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/bg/query-parser-templates.html b/ext/bg/query-parser-templates.html
index f7f6d76c..7cab16a9 100644
--- a/ext/bg/query-parser-templates.html
+++ b/ext/bg/query-parser-templates.html
@@ -5,8 +5,7 @@
 <template id="segment-template"><ruby class="query-parser-segment"><span class="query-parser-segment-text"></span><rt class="query-parser-segment-reading"></rt></ruby></template>
 <template id="char-template"><span class="query-parser-char"></span></template>
 
-<template id="select-template"><select class="query-parser-select form-control">
-</select></template>
+<template id="select-template"><select class="query-parser-select form-control"></select></template>
 <template id="select-option-template"><option class="query-parser-select-option"></option></template>
 
 </body></html>
-- 
cgit v1.2.3


From 4f1ed14f07c1373bc5734a12bbb3203c1b07a2bd Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 10 Feb 2020 21:56:48 +0200
Subject: simplify TemplateHandler

---
 ext/mixed/js/template-handler.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ext/mixed/js/template-handler.js b/ext/mixed/js/template-handler.js
index 86e2414f..a5a62937 100644
--- a/ext/mixed/js/template-handler.js
+++ b/ext/mixed/js/template-handler.js
@@ -20,15 +20,9 @@
 class TemplateHandler {
     constructor(html) {
         this._templates = new Map();
-        this._html = html;
-        this._doc = null;
 
-        this._initialize();
-    }
-
-    _initialize() {
-        this._doc = new DOMParser().parseFromString(this._html, 'text/html');
-        for (const template of this._doc.querySelectorAll('template')) {
+        const doc = new DOMParser().parseFromString(html, 'text/html');
+        for (const template of doc.querySelectorAll('template')) {
             this._setTemplate(template);
         }
     }
-- 
cgit v1.2.3


From 9c98c631afde843f8b5ed4c54fc1f4ff0ec3a00a Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 10 Feb 2020 22:09:23 +0200
Subject: fix async issues

---
 ext/bg/js/search-query-parser-generator.js | 3 +--
 ext/bg/js/search-query-parser.js           | 4 ++++
 ext/bg/js/search.js                        | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js
index 67a1ccad..8d71890b 100644
--- a/ext/bg/js/search-query-parser-generator.js
+++ b/ext/bg/js/search-query-parser-generator.js
@@ -20,10 +20,9 @@
 class QueryParserGenerator {
     constructor() {
         this._templateHandler = null;
-        this._initialize();
     }
 
-    async _initialize() {
+    async prepare() {
         const html = await apiGetQueryParserTemplatesHtml();
         this._templateHandler = new TemplateHandler(html);
     }
diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index 3a93c7e7..f648fdd4 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -31,6 +31,10 @@ class QueryParser extends TextScanner {
         this.queryParserGenerator = new QueryParserGenerator();
     }
 
+    async prepare() {
+        await this.queryParserGenerator.prepare();
+    }
+
     onError(error) {
         logError(error, false);
     }
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 4da27513..6641255f 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -49,6 +49,8 @@ class DisplaySearch extends Display {
         try {
             await this.initialize();
 
+            await this.queryParser.prepare();
+
             const {queryParams: {query='', mode=''}} = parseUrl(window.location.href);
 
             if (this.search !== null) {
-- 
cgit v1.2.3


From bbb74d0a48e389f3b29e9d9a53c1ac383e8046fe Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 10 Feb 2020 20:38:20 -0500
Subject: Assign _isInitialized

---
 ext/mixed/js/display-generator.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index c90e693a..d5ab9dbc 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -307,6 +307,7 @@ class DisplayGenerator {
         const html = await apiGetDisplayTemplatesHtml();
         const doc = new DOMParser().parseFromString(html, 'text/html');
         this._setTemplates(doc);
+        this._isInitialized = true;
     }
 
     _setTemplates(doc) {
-- 
cgit v1.2.3


From 17181eb97efcef6a4221397cfe6030b880792e32 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 10 Feb 2020 21:38:11 -0500
Subject: Improve style of some tags

---
 ext/mixed/css/display.css        | 11 ++++++++---
 ext/mixed/display-templates.html |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 62e62243..f131bda3 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -227,8 +227,8 @@ button.action-button {
     display: block;
 }
 
-.tag-list>.tag+.tag {
-    margin-left: 0.375em;
+.tag-list>.tag:not(:last-child) {
+    margin-right: 0.375em;
 }
 
 html:root:not([data-enable-search-tags=true]) .tag[data-category=search] {
@@ -398,7 +398,7 @@ html:root:not([data-enable-search-tags=true]) .tag[data-category=search] {
 
 :root[data-compact-glossaries=true] .term-definition-tag-list,
 :root[data-compact-glossaries=true] .term-definition-only-list:not([data-count="0"]) {
-    display: inline-block;
+    display: inline;
 }
 
 :root[data-compact-glossaries=true] .term-glossary-list {
@@ -425,6 +425,11 @@ html:root:not([data-enable-search-tags=true]) .tag[data-category=search] {
     white-space: pre-wrap;
 }
 
+.term-special-tags>.frequencies {
+    display: inline;
+}
+
+
 /*
  * Kanji
  */
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 6fcf4c74..7ae51a62 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -15,7 +15,7 @@
             </div>
             <div class="term-reasons"></div>
         </div>
-        <div class="frequencies"></div>
+        <div class="term-special-tags"><div class="frequencies tag-list"></div></div>
     </div>
     <div class="term-definition-container"><ol class="term-definition-list"></ol></div>
     <pre class="debug-info"></pre>
-- 
cgit v1.2.3


From 65dfb855fb23d8279367651ab650f3347aa236ac Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 11 Feb 2020 22:21:55 -0500
Subject: Fix undefined id

---
 ext/fg/js/popup-proxy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index 4cacee53..63aa6bbe 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -69,7 +69,7 @@ class PopupProxy {
         if (this._id === null) {
             return;
         }
-        this._invokeHostApi('setVisibleOverride', {id, visible});
+        this._invokeHostApi('setVisibleOverride', {id: this._id, visible});
     }
 
     async containsPoint(x, y) {
-- 
cgit v1.2.3


From cb6e8d07d02e77389e3d395517863a2c9ff8e170 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 15:00:11 -0500
Subject: Add more settings to eslintrc

---
 .eslintrc.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0e3b939a..81fe517f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,14 @@
 {
+    "root": true,
     "extends": "eslint:recommended",
     "parserOptions": {
-        "ecmaVersion": 8
+        "ecmaVersion": 8,
+        "sourceType": "script"
+    },
+    "env": {
+        "browser": true,
+        "es2017": true,
+        "webextensions": true
     },
     "ignorePatterns": [
         "/ext/mixed/lib/",
@@ -18,6 +25,7 @@
         "no-constant-condition": "off",
         "no-undef": "off",
         "no-unused-vars": ["error", {"vars": "local", "args": "after-used", "argsIgnorePattern": "^_", "caughtErrors": "none"}],
+        "no-unused-expressions": "error",
         "no-var": "error",
         "prefer-const": ["error", {"destructuring": "all"}],
         "quote-props": ["error", "consistent"],
-- 
cgit v1.2.3


From 4629fb3639ec28e6c514b4a364b71e4192575b9b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 15:00:34 -0500
Subject: Change no-undef from off to error

---
 .eslintrc.json                            | 37 +++++++++++++++++++++++++++++--
 ext/bg/js/anki.js                         |  1 +
 ext/bg/js/audio.js                        |  1 +
 ext/bg/js/backend.js                      |  8 +++++++
 ext/bg/js/context.js                      |  1 +
 ext/bg/js/database.js                     |  1 +
 ext/bg/js/dictionary.js                   |  1 +
 ext/bg/js/handlebars.js                   |  1 +
 ext/bg/js/japanese.js                     |  1 +
 ext/bg/js/options.js                      |  1 +
 ext/bg/js/search-frontend.js              |  1 +
 ext/bg/js/search-query-parser.js          |  1 +
 ext/bg/js/search.js                       |  3 +++
 ext/bg/js/settings/anki-templates.js      |  3 +++
 ext/bg/js/settings/anki.js                |  3 +++
 ext/bg/js/settings/audio-ui.js            |  1 +
 ext/bg/js/settings/audio.js               |  2 ++
 ext/bg/js/settings/backup.js              |  4 ++++
 ext/bg/js/settings/conditions-ui.js       |  1 +
 ext/bg/js/settings/dictionaries.js        |  5 +++++
 ext/bg/js/settings/main.js                |  8 +++++++
 ext/bg/js/settings/popup-preview-frame.js |  1 +
 ext/bg/js/settings/profiles.js            |  4 ++++
 ext/bg/js/settings/storage.js             |  1 +
 ext/bg/js/translator.js                   |  6 +++++
 ext/mixed/js/audio.js                     |  1 +
 ext/mixed/js/display-generator.js         |  1 +
 ext/mixed/js/display.js                   |  5 +++++
 ext/mixed/js/text-scanner.js              |  1 +
 29 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 81fe517f..9b1a19b3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -23,7 +23,8 @@
         "no-case-declarations": "error",
         "no-const-assign": "error",
         "no-constant-condition": "off",
-        "no-undef": "off",
+        "no-global-assign": "error",
+        "no-undef": "error",
         "no-unused-vars": ["error", {"vars": "local", "args": "after-used", "argsIgnorePattern": "^_", "caughtErrors": "none"}],
         "no-unused-expressions": "error",
         "no-var": "error",
@@ -32,5 +33,37 @@
         "quotes": ["error", "single", "avoid-escape"],
         "require-atomic-updates": "off",
         "semi": "error"
-    }
+    },
+    "overrides": [
+        {
+            "files": ["*.js"],
+            "excludedFiles": ["ext/mixed/js/core.js"],
+            "globals": {
+                "yomichan": "readonly",
+                "errorToJson": "readonly",
+                "jsonToError": "readonly",
+                "logError": "readonly",
+                "isObject": "readonly",
+                "hasOwn": "readonly",
+                "toIterable": "readonly",
+                "stringReverse": "readonly",
+                "promiseTimeout": "readonly",
+                "stringReplaceAsync": "readonly",
+                "EventDispatcher": "readonly",
+                "EXTENSION_IS_BROWSER_EDGE": "readonly"
+            }
+        },
+        {
+            "files": ["ext/mixed/js/core.js"],
+            "globals": {
+                "chrome": "writable"
+            }
+        },
+        {
+            "files": ["ext/bg/js/settings/*.js"],
+            "env": {
+                "jquery": true
+            }
+        }
+    ]
 }
diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
index 10a07061..39c6ad51 100644
--- a/ext/bg/js/anki.js
+++ b/ext/bg/js/anki.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global requestJson*/
 
 /*
  * AnkiConnect
diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js
index d1e4af9e..6389528b 100644
--- a/ext/bg/js/audio.js
+++ b/ext/bg/js/audio.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global jpIsStringEntirelyKana, audioGetFromSources*/
 
 const audioUrlBuilders = new Map([
     ['jpod101', async (definition) => {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 529055d2..1a1dc735 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -16,6 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global optionsSave, utilIsolate
+conditionsTestValue, profileConditionsDescriptor, profileOptionsGetDefaultFieldTemplates
+handlebarsRenderDynamic, handlebarsRenderStatic
+requestText, requestJson, optionsLoad
+dictConfigured, dictTermsSort, dictEnabledSet, dictNoteFormat
+audioGetUrl, audioInject
+jpConvertReading, jpDistributeFuriganaInflected, jpKatakanaToHiragana
+Translator, AnkiConnect, AnkiNull, Mecab, BackendApiForwarder, JsonSchema*/
 
 class Backend {
     constructor() {
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
index 37adb6b7..bec964fb 100644
--- a/ext/bg/js/context.js
+++ b/ext/bg/js/context.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiCommandExec, apiGetEnvironmentInfo, apiOptionsGet*/
 
 function showExtensionInfo() {
     const node = document.getElementById('extension-info');
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index e87cc64b..b54d832c 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global dictFieldSplit, dictTagSanitize, JSZip*/
 
 class Database {
     constructor() {
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 48f65d6c..e03dece0 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global utilSetEqual, utilSetIntersection, apiTemplateRender*/
 
 function dictEnabledSet(options) {
     const dictionaries = {};
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
index 62f89ee4..e8cb67eb 100644
--- a/ext/bg/js/handlebars.js
+++ b/ext/bg/js/handlebars.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global jpIsCharCodeKanji, jpDistributeFurigana, Handlebars*/
 
 function handlebarsEscape(text) {
     return Handlebars.Utils.escapeExpression(text);
diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
index c45c0958..e8a6fa08 100644
--- a/ext/bg/js/japanese.js
+++ b/ext/bg/js/japanese.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global wanakana*/
 
 const JP_HALFWIDTH_KATAKANA_MAPPING = new Map([
     ['ｦ', 'ヲヺ-'],
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 97032660..f9db99a2 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global utilStringHashCode*/
 
 /*
  * Generic options functions
diff --git a/ext/bg/js/search-frontend.js b/ext/bg/js/search-frontend.js
index e453ccef..509c4009 100644
--- a/ext/bg/js/search-frontend.js
+++ b/ext/bg/js/search-frontend.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiOptionsGet*/
 
 async function searchFrontendSetup() {
     const optionsContext = {
diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index f648fdd4..ff0dbaef 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiTermsFind, apiOptionsSet, apiTextParse, apiTextParseMecab, apiTemplateRender, TextScanner*/
 
 class QueryParser extends TextScanner {
     constructor(search) {
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 6641255f..312d1de4 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global jpIsStringPartiallyJapanese, apiOptionsSet, apiTermsFind, apiClipboardGet, apiGetEnvironmentInfo
+Display, QueryParser*/
+
 class DisplaySearch extends Display {
     constructor() {
         super(document.querySelector('#spinner'), document.querySelector('#content'));
diff --git a/ext/bg/js/settings/anki-templates.js b/ext/bg/js/settings/anki-templates.js
index 5e74358f..2e80e334 100644
--- a/ext/bg/js/settings/anki-templates.js
+++ b/ext/bg/js/settings/anki-templates.js
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global getOptionsContext, getOptionsMutable, settingsSaveOptions
+profileOptionsGetDefaultFieldTemplates, ankiGetFieldMarkers, ankiGetFieldMarkersHtml, dictFieldFormat
+apiOptionsGet, apiTermsFind*/
 
 function onAnkiFieldTemplatesReset(e) {
     e.preventDefault();
diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki.js
index f55989fc..4263fc51 100644
--- a/ext/bg/js/settings/anki.js
+++ b/ext/bg/js/settings/anki.js
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global getOptionsContext, getOptionsMutable, settingsSaveOptions
+utilBackgroundIsolate, utilAnkiGetDeckNames, utilAnkiGetModelNames, utilAnkiGetModelFieldNames
+onFormOptionsChanged*/
 
 // Private
 
diff --git a/ext/bg/js/settings/audio-ui.js b/ext/bg/js/settings/audio-ui.js
index 711c2291..e918609e 100644
--- a/ext/bg/js/settings/audio-ui.js
+++ b/ext/bg/js/settings/audio-ui.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global toIterable*/
 
 class AudioSourceUI {
     static instantiateTemplate(templateSelector) {
diff --git a/ext/bg/js/settings/audio.js b/ext/bg/js/settings/audio.js
index cff3f521..588d9a11 100644
--- a/ext/bg/js/settings/audio.js
+++ b/ext/bg/js/settings/audio.js
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global getOptionsContext, getOptionsMutable, settingsSaveOptions
+AudioSourceUI, audioGetTextToSpeechVoice*/
 
 let audioSourceUI = null;
 
diff --git a/ext/bg/js/settings/backup.js b/ext/bg/js/settings/backup.js
index becdc568..6d1f28e9 100644
--- a/ext/bg/js/settings/backup.js
+++ b/ext/bg/js/settings/backup.js
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiOptionsGetFull, apiGetEnvironmentInfo
+utilBackend, utilIsolate, utilBackgroundIsolate, utilReadFileArrayBuffer
+optionsGetDefault, optionsUpdateVersion
+profileOptionsGetDefaultFieldTemplates*/
 
 // Exporting
 
diff --git a/ext/bg/js/settings/conditions-ui.js b/ext/bg/js/settings/conditions-ui.js
index 4d041451..5a271321 100644
--- a/ext/bg/js/settings/conditions-ui.js
+++ b/ext/bg/js/settings/conditions-ui.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global conditionsNormalizeOptionValue*/
 
 class ConditionsUI {
     static instantiateTemplate(templateSelector) {
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 0d827f49..c80aac73 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -16,6 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global getOptionsContext, getOptionsMutable, getOptionsFullMutable, settingsSaveOptions, apiOptionsGetFull
+utilBackgroundIsolate, utilDatabaseDeleteDictionary, utilDatabaseGetDictionaryInfo, utilDatabaseGetDictionaryCounts
+utilDatabasePurge, utilDatabaseImport
+storageUpdateStats, storageEstimate
+PageExitPrevention*/
 
 let dictionaryUI = null;
 
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index cf0f08db..1ba4a7ef 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -16,6 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global getOptionsContext, apiOptionsSave
+utilBackend, utilIsolate, utilBackgroundIsolate
+ankiErrorShown, ankiFieldsToDict
+ankiTemplatesUpdateValue, onAnkiOptionsChanged, onDictionaryOptionsChanged
+appearanceInitialize, audioSettingsInitialize, profileOptionsSetup, dictSettingsInitialize
+ankiInitialize, ankiTemplatesInitialize, storageInfoInitialize
+*/
+
 function getOptionsMutable(optionsContext) {
     return utilBackend().getOptions(
         utilBackgroundIsolate(optionsContext)
diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 37a4b416..042f335f 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiOptionsGet, Popup, PopupProxyHost, Frontend, TextSourceRange*/
 
 class SettingsPopupPreview {
     constructor() {
diff --git a/ext/bg/js/settings/profiles.js b/ext/bg/js/settings/profiles.js
index c4e68b53..3e589809 100644
--- a/ext/bg/js/settings/profiles.js
+++ b/ext/bg/js/settings/profiles.js
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global getOptionsMutable, getOptionsFullMutable, settingsSaveOptions, apiOptionsGetFull
+utilBackgroundIsolate, formWrite
+conditionsClearCaches, ConditionsUI, profileConditionsDescriptor*/
+
 let currentProfileIndex = 0;
 let profileConditionsContainer = null;
 
diff --git a/ext/bg/js/settings/storage.js b/ext/bg/js/settings/storage.js
index 6c10f665..cbe1bb4d 100644
--- a/ext/bg/js/settings/storage.js
+++ b/ext/bg/js/settings/storage.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiGetEnvironmentInfo*/
 
 function storageBytesToLabeledString(size) {
     const base = 1000;
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index d32f8c67..81c2464b 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -16,6 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global requestJson
+dictTermsMergeBySequence, dictTagBuildSource, dictTermsMergeByGloss, dictTermsSort, dictTagsSort
+dictEnabledSet, dictTermsGroup, dictTermsCompressTags, dictTermsUndupe, dictTagSanitize
+jpDistributeFurigana, jpConvertHalfWidthKanaToFullWidth, jpConvertNumericTofullWidth
+jpConvertAlphabeticToKana, jpHiraganaToKatakana, jpKatakanaToHiragana, jpIsCharCodeJapanese
+Database, Deinflector*/
 
 class Translator {
     constructor() {
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
index b0c5fa82..76a3e7da 100644
--- a/ext/mixed/js/audio.js
+++ b/ext/mixed/js/audio.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiAudioGetUrl*/
 
 class TextToSpeechAudio {
     constructor(text, voice) {
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index d5ab9dbc..3617e546 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*global apiGetDisplayTemplatesHtml*/
 
 class DisplayGenerator {
     constructor() {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index a6cfe848..b18e275d 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -16,6 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global docRangeFromPoint, docSentenceExtract
+apiKanjiFind, apiTermsFind, apiNoteView, apiOptionsGet, apiDefinitionsAddable, apiDefinitionAdd
+apiScreenshotGet, apiForward
+audioPrepareTextToSpeech, audioGetFromSources
+DisplayGenerator, WindowScroll, DisplayContext, DOM*/
 
 class Display {
     constructor(spinner, container) {
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index 88f1e27a..e6da1e5e 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global docRangeFromPoint, TextSourceRange, DOM*/
 
 class TextScanner {
     constructor(node, ignoreNodes, ignoreElements, ignorePoints) {
-- 
cgit v1.2.3


From ab9d2b38e04c9909d0a7f4cbb28fe069a6515b2a Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 1 Feb 2020 17:27:48 -0500
Subject: Remove redundant declaration

---
 ext/bg/js/settings/audio-ui.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ext/bg/js/settings/audio-ui.js b/ext/bg/js/settings/audio-ui.js
index e918609e..555380b4 100644
--- a/ext/bg/js/settings/audio-ui.js
+++ b/ext/bg/js/settings/audio-ui.js
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global toIterable*/
-
 class AudioSourceUI {
     static instantiateTemplate(templateSelector) {
         const template = document.querySelector(templateSelector);
-- 
cgit v1.2.3


From e2ac478cb7635cbd15d0033bd2c486689a7b4e67 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 11 Feb 2020 22:19:47 -0500
Subject: Define more globals

---
 .eslintrc.json                             | 1 +
 ext/bg/js/backend.js                       | 2 +-
 ext/bg/js/clipboard-monitor.js             | 1 +
 ext/bg/js/search-query-parser-generator.js | 1 +
 ext/bg/js/search-query-parser.js           | 2 +-
 ext/bg/js/search.js                        | 2 +-
 ext/bg/js/settings/dictionaries.js         | 2 +-
 ext/fg/js/document.js                      | 1 +
 ext/fg/js/float.js                         | 1 +
 ext/fg/js/frontend-initialize.js           | 1 +
 ext/fg/js/frontend.js                      | 1 +
 ext/fg/js/popup-nested.js                  | 1 +
 ext/fg/js/popup-proxy-host.js              | 1 +
 ext/fg/js/popup-proxy.js                   | 1 +
 ext/fg/js/popup.js                         | 1 +
 15 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 9b1a19b3..f502479d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -49,6 +49,7 @@
                 "stringReverse": "readonly",
                 "promiseTimeout": "readonly",
                 "stringReplaceAsync": "readonly",
+                "parseUrl": "readonly",
                 "EventDispatcher": "readonly",
                 "EXTENSION_IS_BROWSER_EDGE": "readonly"
             }
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 1a1dc735..7b2ec46d 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -23,7 +23,7 @@ requestText, requestJson, optionsLoad
 dictConfigured, dictTermsSort, dictEnabledSet, dictNoteFormat
 audioGetUrl, audioInject
 jpConvertReading, jpDistributeFuriganaInflected, jpKatakanaToHiragana
-Translator, AnkiConnect, AnkiNull, Mecab, BackendApiForwarder, JsonSchema*/
+Translator, AnkiConnect, AnkiNull, Mecab, BackendApiForwarder, JsonSchema, ClipboardMonitor*/
 
 class Backend {
     constructor() {
diff --git a/ext/bg/js/clipboard-monitor.js b/ext/bg/js/clipboard-monitor.js
index b4a27fa2..c2f41385 100644
--- a/ext/bg/js/clipboard-monitor.js
+++ b/ext/bg/js/clipboard-monitor.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiClipboardGet, jpIsStringPartiallyJapanese*/
 
 class ClipboardMonitor {
     constructor() {
diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js
index 8d71890b..f842644e 100644
--- a/ext/bg/js/search-query-parser-generator.js
+++ b/ext/bg/js/search-query-parser-generator.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiGetQueryParserTemplatesHtml, TemplateHandler*/
 
 class QueryParserGenerator {
     constructor() {
diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index ff0dbaef..49c0bb34 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global apiTermsFind, apiOptionsSet, apiTextParse, apiTextParseMecab, apiTemplateRender, TextScanner*/
+/*global apiTermsFind, apiOptionsSet, apiTextParse, apiTextParseMecab, apiTemplateRender, TextScanner, QueryParserGenerator*/
 
 class QueryParser extends TextScanner {
     constructor(search) {
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 312d1de4..50ec146f 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -17,7 +17,7 @@
  */
 
 /*global jpIsStringPartiallyJapanese, apiOptionsSet, apiTermsFind, apiClipboardGet, apiGetEnvironmentInfo
-Display, QueryParser*/
+Display, QueryParser, ClipboardMonitor*/
 
 class DisplaySearch extends Display {
     constructor() {
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index c80aac73..fb459404 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global getOptionsContext, getOptionsMutable, getOptionsFullMutable, settingsSaveOptions, apiOptionsGetFull
+/*global getOptionsContext, getOptionsMutable, getOptionsFullMutable, settingsSaveOptions, apiOptionsGetFull, apiOptionsGet
 utilBackgroundIsolate, utilDatabaseDeleteDictionary, utilDatabaseGetDictionaryInfo, utilDatabaseGetDictionaryCounts
 utilDatabasePurge, utilDatabaseImport
 storageUpdateStats, storageEstimate
diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index 71654b29..7284cdd1 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global TextSourceElement, TextSourceRange, DOM*/
 
 const REGEX_TRANSPARENT_COLOR = /rgba\s*\([^)]*,\s*0(?:\.0+)?\s*\)/;
 
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 8d61d8f6..d31b8336 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global popupNestedInitialize, Display*/
 
 class DisplayFloat extends Display {
     constructor() {
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 9c923fea..c32e97d4 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global PopupProxyHost, PopupProxy, Frontend*/
 
 async function main() {
     const data = window.frontendInitializationData || {};
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 2286bf19..3611d44e 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiGetZoom, apiOptionsGet, apiTermsFind, apiKanjiFind, docSentenceExtract, TextScanner*/
 
 class Frontend extends TextScanner {
     constructor(popup, ignoreNodes) {
diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/popup-nested.js
index 3f3c945e..3e5f5b80 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/popup-nested.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiOptionsGet*/
 
 let popupNestedInitialized = false;
 
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index 427172c6..98729796 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiFrameInformationGet, FrontendApiReceiver, Popup*/
 
 class PopupProxyHost {
     constructor() {
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index 63aa6bbe..db6dffb1 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global FrontendApiSender*/
 
 class PopupProxy {
     constructor(depth, parentId, parentFrameId, url) {
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index e7dae93e..0b142dda 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*global apiInjectStylesheet*/
 
 class Popup {
     constructor(id, depth, frameIdPromise) {
-- 
cgit v1.2.3


From 571a1fdbeb47b7557a77ed36291f9d4a604c7653 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 11 Feb 2020 22:21:30 -0500
Subject: Update rules for test files

---
 .eslintrc.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index f502479d..d4ae215b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -65,6 +65,15 @@
             "env": {
                 "jquery": true
             }
+        },
+        {
+            "files": ["test/**/*.js"],
+            "env": {
+                "browser": false,
+                "es2017": false,
+                "webextensions": false,
+                "node": true
+            }
         }
     ]
 }
-- 
cgit v1.2.3


From c8e7a1543ee52943157ff54b2a9983ad20deaa15 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 11 Feb 2020 22:25:48 -0500
Subject: Remove unused

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

diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index 49c0bb34..3d38e6e8 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global apiTermsFind, apiOptionsSet, apiTextParse, apiTextParseMecab, apiTemplateRender, TextScanner, QueryParserGenerator*/
+/*global apiTermsFind, apiOptionsSet, apiTextParse, apiTextParseMecab, TextScanner, QueryParserGenerator*/
 
 class QueryParser extends TextScanner {
     constructor(search) {
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 50ec146f..93bcfa53 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global jpIsStringPartiallyJapanese, apiOptionsSet, apiTermsFind, apiClipboardGet, apiGetEnvironmentInfo
-Display, QueryParser, ClipboardMonitor*/
+/*global apiOptionsSet, apiTermsFind, Display, QueryParser, ClipboardMonitor*/
 
 class DisplaySearch extends Display {
     constructor() {
-- 
cgit v1.2.3


From 93eaee9765c7478ee5ad7485d664b86acf3d4510 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 13 Feb 2020 01:43:01 +0200
Subject: simplify DisplayGenerator initialization

---
 ext/mixed/js/display-generator.js | 26 ++++----------------------
 ext/mixed/js/display.js           | 11 +++--------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index d5ab9dbc..ee3ac4cf 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -19,9 +19,6 @@
 
 class DisplayGenerator {
     constructor() {
-        this._isInitialized = false;
-        this._initializationPromise = null;
-
         this._termEntryTemplate = null;
         this._termExpressionTemplate = null;
         this._termDefinitionItemTemplate = null;
@@ -40,18 +37,10 @@ class DisplayGenerator {
         this._tagFrequencyTemplate = null;
     }
 
-    isInitialized() {
-        return this._isInitialized;
-    }
-
-    initialize() {
-        if (this._isInitialized) {
-            return Promise.resolve();
-        }
-        if (this._initializationPromise === null) {
-            this._initializationPromise = this._initializeInternal();
-        }
-        return this._initializationPromise;
+    async prepare() {
+        const html = await apiGetDisplayTemplatesHtml();
+        const doc = new DOMParser().parseFromString(html, 'text/html');
+        this._setTemplates(doc);
     }
 
     createTermEntry(details) {
@@ -303,13 +292,6 @@ class DisplayGenerator {
         return node;
     }
 
-    async _initializeInternal() {
-        const html = await apiGetDisplayTemplatesHtml();
-        const doc = new DOMParser().parseFromString(html, 'text/html');
-        this._setTemplates(doc);
-        this._isInitialized = true;
-    }
-
     _setTemplates(doc) {
         this._termEntryTemplate = doc.querySelector('#term-entry-template');
         this._termExpressionTemplate = doc.querySelector('#term-expression-template');
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index a6cfe848..cee63d9b 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -243,6 +243,7 @@ class Display {
     }
 
     async initialize(options=null) {
+        await this.displayGenerator.prepare();
         await this.updateOptions(options);
         yomichan.on('optionsUpdate', () => this.updateOptions(null));
     }
@@ -365,10 +366,7 @@ class Display {
             window.focus();
         }
 
-        if (!this.displayGenerator.isInitialized()) {
-            await this.displayGenerator.initialize();
-            if (this.setContentToken !== token) { return; }
-        }
+        if (this.setContentToken !== token) { return; }
 
         this.definitions = definitions;
         if (context.disableHistory) {
@@ -429,10 +427,7 @@ class Display {
             window.focus();
         }
 
-        if (!this.displayGenerator.isInitialized()) {
-            await this.displayGenerator.initialize();
-            if (this.setContentToken !== token) { return; }
-        }
+        if (this.setContentToken !== token) { return; }
 
         this.definitions = definitions;
         if (context.disableHistory) {
-- 
cgit v1.2.3


From df37acd17f9459c17185552f11dc4cc424e01958 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 13 Feb 2020 01:59:26 +0200
Subject: rename display initialize methods to prepare

---
 ext/bg/js/search.js     |  2 +-
 ext/fg/js/float.js      | 30 +++++++++++++++---------------
 ext/mixed/js/display.js | 24 ++++++++++++------------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 6641255f..86ed675a 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -47,7 +47,7 @@ class DisplaySearch extends Display {
 
     async prepare() {
         try {
-            await this.initialize();
+            await super.prepare();
 
             await this.queryParser.prepare();
 
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 8d61d8f6..3766d5a4 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -33,6 +33,20 @@ class DisplayFloat extends Display {
         window.addEventListener('message', (e) => this.onMessage(e), false);
     }
 
+    async prepare(options, popupInfo, url, childrenSupported, scale) {
+        await super.prepare(options);
+
+        const {id, depth, parentFrameId} = popupInfo;
+        this.optionsContext.depth = depth;
+        this.optionsContext.url = url;
+
+        if (childrenSupported) {
+            popupNestedInitialize(id, depth, parentFrameId, url);
+        }
+
+        this.setContentScale(scale);
+    }
+
     onError(error) {
         if (this._orphaned) {
             this.setContent('orphaned');
@@ -92,20 +106,6 @@ class DisplayFloat extends Display {
     setContentScale(scale) {
         document.body.style.fontSize = `${scale}em`;
     }
-
-    async initialize(options, popupInfo, url, childrenSupported, scale) {
-        await super.initialize(options);
-
-        const {id, depth, parentFrameId} = popupInfo;
-        this.optionsContext.depth = depth;
-        this.optionsContext.url = url;
-
-        if (childrenSupported) {
-            popupNestedInitialize(id, depth, parentFrameId, url);
-        }
-
-        this.setContentScale(scale);
-    }
 }
 
 DisplayFloat._onKeyDownHandlers = new Map([
@@ -122,7 +122,7 @@ DisplayFloat._messageHandlers = new Map([
     ['setContent', (self, {type, details}) => self.setContent(type, details)],
     ['clearAutoPlayTimer', (self) => self.clearAutoPlayTimer()],
     ['setCustomCss', (self, {css}) => self.setCustomCss(css)],
-    ['initialize', (self, {options, popupInfo, url, childrenSupported, scale}) => self.initialize(options, popupInfo, url, childrenSupported, scale)],
+    ['initialize', (self, {options, popupInfo, url, childrenSupported, scale}) => self.prepare(options, popupInfo, url, childrenSupported, scale)],
     ['setContentScale', (self, {scale}) => self.setContentScale(scale)]
 ]);
 
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index cee63d9b..8dea625d 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -43,6 +43,16 @@ class Display {
         this.setInteractive(true);
     }
 
+    async prepare(options=null) {
+        await this.displayGenerator.prepare();
+        await this.updateOptions(options);
+        yomichan.on('optionsUpdate', () => this.updateOptions(null));
+    }
+
+    isPrepared() {
+        return this.options !== null;
+    }
+
     onError(_error) {
         throw new Error('Override me');
     }
@@ -238,16 +248,6 @@ class Display {
         throw new Error('Override me');
     }
 
-    isInitialized() {
-        return this.options !== null;
-    }
-
-    async initialize(options=null) {
-        await this.displayGenerator.prepare();
-        await this.updateOptions(options);
-        yomichan.on('optionsUpdate', () => this.updateOptions(null));
-    }
-
     async updateOptions(options) {
         this.options = options ? options : await apiOptionsGet(this.getOptionsContext());
         this.updateDocumentOptions(this.options);
@@ -358,7 +358,7 @@ class Display {
 
     async setContentTerms(definitions, context, token) {
         if (!context) { throw new Error('Context expected'); }
-        if (!this.isInitialized()) { return; }
+        if (!this.isPrepared()) { return; }
 
         this.setEventListenersActive(false);
 
@@ -419,7 +419,7 @@ class Display {
 
     async setContentKanji(definitions, context, token) {
         if (!context) { throw new Error('Context expected'); }
-        if (!this.isInitialized()) { return; }
+        if (!this.isPrepared()) { return; }
 
         this.setEventListenersActive(false);
 
-- 
cgit v1.2.3


From b97f80e4d94e6ed5abe8a6dadb1629712192783c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 8 Feb 2020 14:10:53 -0500
Subject: Setup GitHub actions

---
 .github/workflows/nodejs.yml |   24 +
 .gitignore                   |    1 +
 package-lock.json            | 1015 ++++++++++++++++++++++++++++++++++++++++++
 package.json                 |   30 ++
 4 files changed, 1070 insertions(+)
 create mode 100644 .github/workflows/nodejs.yml
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
new file mode 100644
index 00000000..7c800f85
--- /dev/null
+++ b/.github/workflows/nodejs.yml
@@ -0,0 +1,24 @@
+name: Node.js CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test
+      env:
+        CI: true
diff --git a/.gitignore b/.gitignore
index c4c4ffc6..6dd55d4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.zip
+node_modules
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..0d8eb27f
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1015 @@
+{
+    "name": "yomichan",
+    "version": "0.0.0",
+    "lockfileVersion": 1,
+    "requires": true,
+    "dependencies": {
+        "@babel/code-frame": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+            "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+            "dev": true,
+            "requires": {
+                "@babel/highlight": "^7.8.3"
+            }
+        },
+        "@babel/highlight": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+            "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.0.0",
+                "esutils": "^2.0.2",
+                "js-tokens": "^4.0.0"
+            }
+        },
+        "acorn": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+            "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+            "dev": true
+        },
+        "acorn-jsx": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
+            "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
+            "dev": true
+        },
+        "ajv": {
+            "version": "6.11.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
+            "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
+            "dev": true,
+            "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            }
+        },
+        "ansi-escapes": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
+            "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
+            "dev": true,
+            "requires": {
+                "type-fest": "^0.8.1"
+            }
+        },
+        "ansi-regex": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+            "dev": true
+        },
+        "ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "requires": {
+                "color-convert": "^1.9.0"
+            }
+        },
+        "argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "requires": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "astral-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+            "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+            "dev": true
+        },
+        "balanced-match": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+            "dev": true
+        },
+        "brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true
+        },
+        "chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            }
+        },
+        "chardet": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+            "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+            "dev": true
+        },
+        "cli-cursor": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+            "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+            "dev": true,
+            "requires": {
+                "restore-cursor": "^3.1.0"
+            }
+        },
+        "cli-width": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+            "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+            "dev": true
+        },
+        "color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "requires": {
+                "color-name": "1.1.3"
+            }
+        },
+        "color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+            "dev": true
+        },
+        "concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
+        },
+        "cross-spawn": {
+            "version": "6.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+            "dev": true,
+            "requires": {
+                "nice-try": "^1.0.4",
+                "path-key": "^2.0.1",
+                "semver": "^5.5.0",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "5.7.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "dev": true
+                }
+            }
+        },
+        "debug": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+            "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+            "dev": true,
+            "requires": {
+                "ms": "^2.1.1"
+            }
+        },
+        "deep-is": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+            "dev": true
+        },
+        "doctrine": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+            "dev": true,
+            "requires": {
+                "esutils": "^2.0.2"
+            }
+        },
+        "emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "dev": true
+        },
+        "eslint": {
+            "version": "6.8.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+            "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "ajv": "^6.10.0",
+                "chalk": "^2.1.0",
+                "cross-spawn": "^6.0.5",
+                "debug": "^4.0.1",
+                "doctrine": "^3.0.0",
+                "eslint-scope": "^5.0.0",
+                "eslint-utils": "^1.4.3",
+                "eslint-visitor-keys": "^1.1.0",
+                "espree": "^6.1.2",
+                "esquery": "^1.0.1",
+                "esutils": "^2.0.2",
+                "file-entry-cache": "^5.0.1",
+                "functional-red-black-tree": "^1.0.1",
+                "glob-parent": "^5.0.0",
+                "globals": "^12.1.0",
+                "ignore": "^4.0.6",
+                "import-fresh": "^3.0.0",
+                "imurmurhash": "^0.1.4",
+                "inquirer": "^7.0.0",
+                "is-glob": "^4.0.0",
+                "js-yaml": "^3.13.1",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "levn": "^0.3.0",
+                "lodash": "^4.17.14",
+                "minimatch": "^3.0.4",
+                "mkdirp": "^0.5.1",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.8.3",
+                "progress": "^2.0.0",
+                "regexpp": "^2.0.1",
+                "semver": "^6.1.2",
+                "strip-ansi": "^5.2.0",
+                "strip-json-comments": "^3.0.1",
+                "table": "^5.2.3",
+                "text-table": "^0.2.0",
+                "v8-compile-cache": "^2.0.3"
+            }
+        },
+        "eslint-scope": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+            "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+            "dev": true,
+            "requires": {
+                "esrecurse": "^4.1.0",
+                "estraverse": "^4.1.1"
+            }
+        },
+        "eslint-utils": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+            "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+            "dev": true,
+            "requires": {
+                "eslint-visitor-keys": "^1.1.0"
+            }
+        },
+        "eslint-visitor-keys": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+            "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+            "dev": true
+        },
+        "espree": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
+            "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
+            "dev": true,
+            "requires": {
+                "acorn": "^7.1.0",
+                "acorn-jsx": "^5.1.0",
+                "eslint-visitor-keys": "^1.1.0"
+            }
+        },
+        "esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true
+        },
+        "esquery": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+            "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+            "dev": true,
+            "requires": {
+                "estraverse": "^4.0.0"
+            }
+        },
+        "esrecurse": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+            "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+            "dev": true,
+            "requires": {
+                "estraverse": "^4.1.0"
+            }
+        },
+        "estraverse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+            "dev": true
+        },
+        "esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true
+        },
+        "external-editor": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+            "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+            "dev": true,
+            "requires": {
+                "chardet": "^0.7.0",
+                "iconv-lite": "^0.4.24",
+                "tmp": "^0.0.33"
+            }
+        },
+        "fast-deep-equal": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+            "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+            "dev": true
+        },
+        "fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true
+        },
+        "fast-levenshtein": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+            "dev": true
+        },
+        "figures": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
+            "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
+            "dev": true,
+            "requires": {
+                "escape-string-regexp": "^1.0.5"
+            }
+        },
+        "file-entry-cache": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+            "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+            "dev": true,
+            "requires": {
+                "flat-cache": "^2.0.1"
+            }
+        },
+        "flat-cache": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+            "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+            "dev": true,
+            "requires": {
+                "flatted": "^2.0.0",
+                "rimraf": "2.6.3",
+                "write": "1.0.3"
+            }
+        },
+        "flatted": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+            "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+            "dev": true
+        },
+        "fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true
+        },
+        "functional-red-black-tree": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+            "dev": true
+        },
+        "glob": {
+            "version": "7.1.6",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+            "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+            "dev": true,
+            "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            }
+        },
+        "glob-parent": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+            "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+            "dev": true,
+            "requires": {
+                "is-glob": "^4.0.1"
+            }
+        },
+        "globals": {
+            "version": "12.3.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
+            "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
+            "dev": true,
+            "requires": {
+                "type-fest": "^0.8.1"
+            }
+        },
+        "has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "dev": true
+        },
+        "iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            }
+        },
+        "ignore": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+            "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+            "dev": true
+        },
+        "import-fresh": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+            "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+            "dev": true,
+            "requires": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            }
+        },
+        "imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+            "dev": true
+        },
+        "inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "inquirer": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
+            "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
+            "dev": true,
+            "requires": {
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^2.4.2",
+                "cli-cursor": "^3.1.0",
+                "cli-width": "^2.0.0",
+                "external-editor": "^3.0.3",
+                "figures": "^3.0.0",
+                "lodash": "^4.17.15",
+                "mute-stream": "0.0.8",
+                "run-async": "^2.2.0",
+                "rxjs": "^6.5.3",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^5.1.0",
+                "through": "^2.3.6"
+            }
+        },
+        "is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+            "dev": true
+        },
+        "is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true
+        },
+        "is-glob": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "dev": true,
+            "requires": {
+                "is-extglob": "^2.1.1"
+            }
+        },
+        "is-promise": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+            "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+            "dev": true
+        },
+        "isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+            "dev": true
+        },
+        "js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "js-yaml": {
+            "version": "3.13.1",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+            "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+            "dev": true,
+            "requires": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            }
+        },
+        "json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true
+        },
+        "json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+            "dev": true
+        },
+        "levn": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+            "dev": true,
+            "requires": {
+                "prelude-ls": "~1.1.2",
+                "type-check": "~0.3.2"
+            }
+        },
+        "lodash": {
+            "version": "4.17.15",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+            "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+            "dev": true
+        },
+        "mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true
+        },
+        "minimatch": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
+            "requires": {
+                "brace-expansion": "^1.1.7"
+            }
+        },
+        "minimist": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+            "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+            "dev": true
+        },
+        "mkdirp": {
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+            "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+            "dev": true,
+            "requires": {
+                "minimist": "0.0.8"
+            }
+        },
+        "ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
+        "mute-stream": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+            "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+            "dev": true
+        },
+        "natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+            "dev": true
+        },
+        "nice-try": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+            "dev": true
+        },
+        "once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
+            "requires": {
+                "wrappy": "1"
+            }
+        },
+        "onetime": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+            "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+            "dev": true,
+            "requires": {
+                "mimic-fn": "^2.1.0"
+            }
+        },
+        "optionator": {
+            "version": "0.8.3",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+            "dev": true,
+            "requires": {
+                "deep-is": "~0.1.3",
+                "fast-levenshtein": "~2.0.6",
+                "levn": "~0.3.0",
+                "prelude-ls": "~1.1.2",
+                "type-check": "~0.3.2",
+                "word-wrap": "~1.2.3"
+            }
+        },
+        "os-tmpdir": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+            "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+            "dev": true
+        },
+        "parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "requires": {
+                "callsites": "^3.0.0"
+            }
+        },
+        "path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true
+        },
+        "path-key": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+            "dev": true
+        },
+        "prelude-ls": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+            "dev": true
+        },
+        "progress": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+            "dev": true
+        },
+        "punycode": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "dev": true
+        },
+        "regexpp": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+            "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+            "dev": true
+        },
+        "resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true
+        },
+        "restore-cursor": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+            "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+            "dev": true,
+            "requires": {
+                "onetime": "^5.1.0",
+                "signal-exit": "^3.0.2"
+            }
+        },
+        "rimraf": {
+            "version": "2.6.3",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+            "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+            "dev": true,
+            "requires": {
+                "glob": "^7.1.3"
+            }
+        },
+        "run-async": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+            "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+            "dev": true,
+            "requires": {
+                "is-promise": "^2.1.0"
+            }
+        },
+        "rxjs": {
+            "version": "6.5.4",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+            "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+            "dev": true,
+            "requires": {
+                "tslib": "^1.9.0"
+            }
+        },
+        "safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "semver": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "dev": true
+        },
+        "shebang-command": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+            "dev": true,
+            "requires": {
+                "shebang-regex": "^1.0.0"
+            }
+        },
+        "shebang-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+            "dev": true
+        },
+        "signal-exit": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+            "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+            "dev": true
+        },
+        "slice-ansi": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+            "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^3.2.0",
+                "astral-regex": "^1.0.0",
+                "is-fullwidth-code-point": "^2.0.0"
+            },
+            "dependencies": {
+                "is-fullwidth-code-point": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+                    "dev": true
+                }
+            }
+        },
+        "sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+            "dev": true
+        },
+        "string-width": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+            "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+            "dev": true,
+            "requires": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "dependencies": {
+                "strip-ansi": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^5.0.0"
+                    }
+                }
+            }
+        },
+        "strip-ansi": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+            "dev": true,
+            "requires": {
+                "ansi-regex": "^4.1.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+                    "dev": true
+                }
+            }
+        },
+        "strip-json-comments": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+            "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+            "dev": true
+        },
+        "supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "requires": {
+                "has-flag": "^3.0.0"
+            }
+        },
+        "table": {
+            "version": "5.4.6",
+            "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+            "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+            "dev": true,
+            "requires": {
+                "ajv": "^6.10.2",
+                "lodash": "^4.17.14",
+                "slice-ansi": "^2.1.0",
+                "string-width": "^3.0.0"
+            },
+            "dependencies": {
+                "emoji-regex": {
+                    "version": "7.0.3",
+                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+                    "dev": true
+                },
+                "is-fullwidth-code-point": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+                    "dev": true
+                },
+                "string-width": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+                    "dev": true,
+                    "requires": {
+                        "emoji-regex": "^7.0.1",
+                        "is-fullwidth-code-point": "^2.0.0",
+                        "strip-ansi": "^5.1.0"
+                    }
+                }
+            }
+        },
+        "text-table": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+            "dev": true
+        },
+        "through": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+            "dev": true
+        },
+        "tmp": {
+            "version": "0.0.33",
+            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+            "dev": true,
+            "requires": {
+                "os-tmpdir": "~1.0.2"
+            }
+        },
+        "tslib": {
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+            "dev": true
+        },
+        "type-check": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+            "dev": true,
+            "requires": {
+                "prelude-ls": "~1.1.2"
+            }
+        },
+        "type-fest": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+            "dev": true
+        },
+        "uri-js": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+            "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+            "dev": true,
+            "requires": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "v8-compile-cache": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+            "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+            "dev": true
+        },
+        "which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "requires": {
+                "isexe": "^2.0.0"
+            }
+        },
+        "word-wrap": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "dev": true
+        },
+        "wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
+        },
+        "write": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+            "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+            "dev": true,
+            "requires": {
+                "mkdirp": "^0.5.1"
+            }
+        }
+    }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..eb1fb25c
--- /dev/null
+++ b/package.json
@@ -0,0 +1,30 @@
+{
+    "name": "yomichan",
+    "version": "0.0.0",
+    "description": "Japanese pop-up dictionary extension for Chrome and Firefox.",
+    "directories": {
+        "test": "test"
+    },
+    "scripts": {
+        "test": "npm run test-lint",
+        "test-lint": "eslint ."
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/FooSoft/yomichan.git"
+    },
+    "author": "FooSoft",
+    "licenses": [
+        {
+            "type": "GPLv3",
+            "url": "https://www.gnu.org/licenses/gpl-3.0.html"
+        }
+    ],
+    "bugs": {
+        "url": "https://github.com/FooSoft/yomichan/issues"
+    },
+    "homepage": "https://foosoft.net/projects/yomichan/",
+    "devDependencies": {
+        "eslint": "^6.8.0"
+    }
+}
-- 
cgit v1.2.3


From e83167dcd1f40ed8c9fd0f2f1039717b61175e9e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 11 Feb 2020 22:11:28 -0500
Subject: Add eslint-plugin-no-unsanitized

---
 .eslintrc.json    | 5 ++++-
 package-lock.json | 6 ++++++
 package.json      | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index d4ae215b..39c5e964 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,6 +10,7 @@
         "es2017": true,
         "webextensions": true
     },
+    "plugins": ["no-unsanitized"],
     "ignorePatterns": [
         "/ext/mixed/lib/",
         "/ext/bg/js/templates.js"
@@ -32,7 +33,9 @@
         "quote-props": ["error", "consistent"],
         "quotes": ["error", "single", "avoid-escape"],
         "require-atomic-updates": "off",
-        "semi": "error"
+        "semi": "error",
+        "no-unsanitized/method": "error",
+        "no-unsanitized/property": "error"
     },
     "overrides": [
         {
diff --git a/package-lock.json b/package-lock.json
index 0d8eb27f..11cf28bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -264,6 +264,12 @@
                 "v8-compile-cache": "^2.0.3"
             }
         },
+        "eslint-plugin-no-unsanitized": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.0.2.tgz",
+            "integrity": "sha512-JnwpoH8Sv4QOjrTDutENBHzSnyYtspdjtglYtqUtAHe6f6LLKqykJle+UwFPg23GGwt5hI3amS9CRDezW8GAww==",
+            "dev": true
+        },
         "eslint-scope": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
diff --git a/package.json b/package.json
index eb1fb25c..8e71de59 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     },
     "homepage": "https://foosoft.net/projects/yomichan/",
     "devDependencies": {
-        "eslint": "^6.8.0"
+        "eslint": "^6.8.0",
+        "eslint-plugin-no-unsanitized": "^3.0.2"
     }
 }
-- 
cgit v1.2.3


From c0225f1f844376e5f61222a4d8186a2c914026eb Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 13 Feb 2020 13:18:54 +0200
Subject: notify popup about initialization

---
 ext/fg/js/float.js |  2 ++
 ext/fg/js/popup.js | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 3766d5a4..8871160f 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -45,6 +45,8 @@ class DisplayFloat extends Display {
         }
 
         this.setContentScale(scale);
+
+        window.parent.postMessage('initialized', '*');
     }
 
     onError(error) {
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index e7dae93e..6cfe49e5 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -45,6 +45,8 @@ class Popup {
         this._container.style.height = '0px';
 
         this._updateVisibility();
+
+        window.addEventListener('message', (e) => this.onMessage(e), false);
     }
 
     // Public properties
@@ -129,6 +131,18 @@ class Popup {
         }
     }
 
+    onMessage(e) {
+        const action = e.data;
+        const handler = Popup._windowMessageHandlers.get(action);
+        if (typeof handler !== 'function') { return; }
+
+        handler(this);
+    }
+
+    setInitialized() {
+        throw new Error('Override me');
+    }
+
     // Popup-only public functions
 
     setParent(parent) {
@@ -237,7 +251,7 @@ class Popup {
                     childrenSupported: this._childrenSupported,
                     scale: this._contentScale
                 });
-                resolve();
+                this.setInitialized = resolve;
             });
             this._observeFullscreen();
             this._onFullscreenChanged();
@@ -535,4 +549,8 @@ class Popup {
     }
 }
 
+Popup._windowMessageHandlers = new Map([
+    ['initialized', (self) => self.setInitialized()]
+]);
+
 Popup.outerStylesheet = null;
-- 
cgit v1.2.3


From 8abab28c4db4bae6e1bce003fc228d26e0458c78 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:36:32 +0200
Subject: remove isPrepared check

---
 ext/mixed/js/display.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 8dea625d..b524fe34 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -49,10 +49,6 @@ class Display {
         yomichan.on('optionsUpdate', () => this.updateOptions(null));
     }
 
-    isPrepared() {
-        return this.options !== null;
-    }
-
     onError(_error) {
         throw new Error('Override me');
     }
@@ -358,7 +354,6 @@ class Display {
 
     async setContentTerms(definitions, context, token) {
         if (!context) { throw new Error('Context expected'); }
-        if (!this.isPrepared()) { return; }
 
         this.setEventListenersActive(false);
 
@@ -419,7 +414,6 @@ class Display {
 
     async setContentKanji(definitions, context, token) {
         if (!context) { throw new Error('Context expected'); }
-        if (!this.isPrepared()) { return; }
 
         this.setEventListenersActive(false);
 
-- 
cgit v1.2.3


From 38a6433a46a4259666864a57c5adbd58cb59db86 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 13 Feb 2020 15:04:10 +0200
Subject: remove isInjected checks from Popup

---
 ext/fg/js/popup.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 6cfe49e5..ad4e5181 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -27,8 +27,6 @@ class Popup {
         this._child = null;
         this._childrenSupported = true;
         this._injectPromise = null;
-        this._isInjected = false;
-        this._isInjectedAndLoaded = false;
         this._visible = false;
         this._visibleOverride = null;
         this._options = null;
@@ -119,16 +117,12 @@ class Popup {
     }
 
     clearAutoPlayTimer() {
-        if (this._isInjectedAndLoaded) {
-            this._invokeApi('clearAutoPlayTimer');
-        }
+        this._invokeApi('clearAutoPlayTimer');
     }
 
     setContentScale(scale) {
         this._contentScale = scale;
-        if (this._isInjectedAndLoaded) {
-            this._invokeApi('setContentScale', {scale});
-        }
+        this._invokeApi('setContentScale', {scale});
     }
 
     onMessage(e) {
@@ -160,7 +154,7 @@ class Popup {
     }
 
     isVisibleSync() {
-        return this._isInjected && (this._visibleOverride !== null ? this._visibleOverride : this._visible);
+        return (this._visibleOverride !== null ? this._visibleOverride : this._visible);
     }
 
     updateTheme() {
@@ -239,7 +233,6 @@ class Popup {
         return new Promise((resolve) => {
             const parentFrameId = (typeof this._frameId === 'number' ? this._frameId : null);
             this._container.addEventListener('load', () => {
-                this._isInjectedAndLoaded = true;
                 this._invokeApi('initialize', {
                     options: this._options,
                     popupInfo: {
@@ -256,7 +249,6 @@ class Popup {
             this._observeFullscreen();
             this._onFullscreenChanged();
             this.setCustomOuterCss(this._options.general.customPopupOuterCss, false);
-            this._isInjected = true;
         });
     }
 
@@ -341,10 +333,9 @@ class Popup {
     }
 
     _invokeApi(action, params={}) {
-        if (!this._isInjectedAndLoaded) {
-            throw new Error('Frame not loaded');
+        if (this._container.contentWindow) {
+            this._container.contentWindow.postMessage({action, params}, '*');
         }
-        this._container.contentWindow.postMessage({action, params}, '*');
     }
 
     _observeFullscreen() {
-- 
cgit v1.2.3


From d7e1ef01d8af4a315a31364eb5138e24a132ea1e Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 13 Feb 2020 16:26:45 +0200
Subject: use Promise.all to await dependencies

---
 ext/bg/js/search.js     | 6 +++---
 ext/mixed/js/display.js | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 86ed675a..bb27205c 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -47,9 +47,9 @@ class DisplaySearch extends Display {
 
     async prepare() {
         try {
-            await super.prepare();
-
-            await this.queryParser.prepare();
+            const superPromise = super.prepare();
+            const queryParserPromise = this.queryParser.prepare();
+            await Promise.all([superPromise, queryParserPromise]);
 
             const {queryParams: {query='', mode=''}} = parseUrl(window.location.href);
 
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index b524fe34..d49c205e 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -44,8 +44,9 @@ class Display {
     }
 
     async prepare(options=null) {
-        await this.displayGenerator.prepare();
-        await this.updateOptions(options);
+        const displayGeneratorPromise = this.displayGenerator.prepare();
+        const updateOptionsPromise = this.updateOptions(options);
+        await Promise.all([displayGeneratorPromise, updateOptionsPromise]);
         yomichan.on('optionsUpdate', () => this.updateOptions(null));
     }
 
-- 
cgit v1.2.3


From e645296b1b5e993355844f2cb2b026b87d05759e Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Fri, 14 Feb 2020 01:12:28 +0200
Subject: fix Map set in Translator.buildTermFrequencies

---
 ext/bg/js/translator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 81c2464b..6d5dd50a 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -460,7 +460,7 @@ class Translator {
                 termList = [];
                 expressionsUnique.push(expression);
                 termsUnique.push(termList);
-                termsUniqueMap[expression] = termList;
+                termsUniqueMap.set(expression, termList);
             }
             termList.push(term);
 
-- 
cgit v1.2.3


From 810a7e7d92d15412974810702d954de60453dd31 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Fri, 14 Feb 2020 02:33:54 +0200
Subject: use sendMessage to notify about initialization

---
 ext/fg/js/float.js            |  2 +-
 ext/fg/js/frontend.js         |  3 ++-
 ext/fg/js/popup-proxy-host.js |  8 +++++++-
 ext/fg/js/popup-proxy.js      |  5 +++++
 ext/fg/js/popup.js            | 18 ++----------------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 8871160f..b42ab8ee 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -46,7 +46,7 @@ class DisplayFloat extends Display {
 
         this.setContentScale(scale);
 
-        window.parent.postMessage('initialized', '*');
+        apiForward('popupSetDisplayInitialized');
     }
 
     onError(error) {
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 2286bf19..571bbf91 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -243,5 +243,6 @@ Frontend._windowMessageHandlers = new Map([
 ]);
 
 Frontend._runtimeMessageHandlers = new Map([
-    ['popupSetVisibleOverride', (self, {visible}) => { self.popup.setVisibleOverride(visible); }]
+    ['popupSetVisibleOverride', (self, {visible}) => { self.popup.setVisibleOverride(visible); }],
+    ['popupSetDisplayInitialized', (self) => { self.popup.setDisplayInitialized(); }]
 ]);
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index 427172c6..8ea70857 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -42,7 +42,8 @@ class PopupProxyHost {
             ['showContent', ({id, elementRect, writingMode, type, details}) => this._onApiShowContent(id, elementRect, writingMode, type, details)],
             ['setCustomCss', ({id, css}) => this._onApiSetCustomCss(id, css)],
             ['clearAutoPlayTimer', ({id}) => this._onApiClearAutoPlayTimer(id)],
-            ['setContentScale', ({id, scale}) => this._onApiSetContentScale(id, scale)]
+            ['setContentScale', ({id, scale}) => this._onApiSetContentScale(id, scale)],
+            ['setDisplayInitialized', ({id}) => this._onApiSetDisplayInitialized(id)]
         ]));
     }
 
@@ -103,6 +104,11 @@ class PopupProxyHost {
         return popup.setContentScale(scale);
     }
 
+    async _onApiSetDisplayInitialized(id) {
+        const popup = this._getPopup(id);
+        return popup.setDisplayInitialized();
+    }
+
     // Private functions
 
     _createPopupInternal(parentId, depth) {
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index 63aa6bbe..f1743064 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -102,6 +102,11 @@ class PopupProxy {
         this._invokeHostApi('setContentScale', {id, scale});
     }
 
+    async setDisplayInitialized() {
+        const id = await this._getPopupId();
+        this._invokeHostApi('setDisplayInitialized', {id});
+    }
+
     // Private
 
     _getPopupId() {
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index ad4e5181..b8233cc2 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -43,8 +43,6 @@ class Popup {
         this._container.style.height = '0px';
 
         this._updateVisibility();
-
-        window.addEventListener('message', (e) => this.onMessage(e), false);
     }
 
     // Public properties
@@ -125,15 +123,7 @@ class Popup {
         this._invokeApi('setContentScale', {scale});
     }
 
-    onMessage(e) {
-        const action = e.data;
-        const handler = Popup._windowMessageHandlers.get(action);
-        if (typeof handler !== 'function') { return; }
-
-        handler(this);
-    }
-
-    setInitialized() {
+    setDisplayInitialized() {
         throw new Error('Override me');
     }
 
@@ -244,7 +234,7 @@ class Popup {
                     childrenSupported: this._childrenSupported,
                     scale: this._contentScale
                 });
-                this.setInitialized = resolve;
+                this.setDisplayInitialized = resolve;
             });
             this._observeFullscreen();
             this._onFullscreenChanged();
@@ -540,8 +530,4 @@ class Popup {
     }
 }
 
-Popup._windowMessageHandlers = new Map([
-    ['initialized', (self) => self.setInitialized()]
-]);
-
 Popup.outerStylesheet = null;
-- 
cgit v1.2.3


From e3c871bc004d9ca612d908f0f3848cdcfc286cd3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:18:15 -0500
Subject: Remove unused handlebarsRenderStatic

---
 ext/bg/js/api.js        |  4 ++--
 ext/bg/js/backend.js    | 10 +++-------
 ext/bg/js/dictionary.js |  2 +-
 ext/bg/js/handlebars.js |  5 -----
 ext/mixed/js/api.js     |  4 ----
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index cd6a9d18..4f1595c7 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -17,8 +17,8 @@
  */
 
 
-function apiTemplateRender(template, data, dynamic) {
-    return _apiInvoke('templateRender', {data, template, dynamic});
+function apiTemplateRender(template, data) {
+    return _apiInvoke('templateRender', {data, template});
 }
 
 function apiAudioGetUrl(definition, source, optionsContext) {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 7b2ec46d..da50bade 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -18,7 +18,7 @@
 
 /*global optionsSave, utilIsolate
 conditionsTestValue, profileConditionsDescriptor, profileOptionsGetDefaultFieldTemplates
-handlebarsRenderDynamic, handlebarsRenderStatic
+handlebarsRenderDynamic
 requestText, requestJson, optionsLoad
 dictConfigured, dictTermsSort, dictEnabledSet, dictNoteFormat
 audioGetUrl, audioInject
@@ -459,12 +459,8 @@ class Backend {
         return this.anki.guiBrowse(`nid:${noteId}`);
     }
 
-    async _onApiTemplateRender({template, data, dynamic}) {
-        return (
-            dynamic ?
-            handlebarsRenderDynamic(template, data) :
-            handlebarsRenderStatic(template, data)
-        );
+    async _onApiTemplateRender({template, data}) {
+        return handlebarsRenderDynamic(template, data);
     }
 
     async _onApiCommandExec({command, params}) {
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index e03dece0..491632a0 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -335,7 +335,7 @@ async function dictFieldFormat(field, definition, mode, options, templates, exce
         }
         data.marker = marker;
         try {
-            return await apiTemplateRender(templates, data, true);
+            return await apiTemplateRender(templates, data);
         } catch (e) {
             if (exceptions) { exceptions.push(e); }
             return `{${marker}-render-error}`;
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
index e8cb67eb..b1443447 100644
--- a/ext/bg/js/handlebars.js
+++ b/ext/bg/js/handlebars.js
@@ -135,11 +135,6 @@ function handlebarsRegisterHelpers() {
     }
 }
 
-function handlebarsRenderStatic(name, data) {
-    handlebarsRegisterHelpers();
-    return Handlebars.templates[name](data).trim();
-}
-
 function handlebarsRenderDynamic(template, data) {
     handlebarsRegisterHelpers();
     const cache = handlebarsRenderDynamic._cache;
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 0b1e7e4f..8eea0628 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -65,10 +65,6 @@ function apiNoteView(noteId) {
     return _apiInvoke('noteView', {noteId});
 }
 
-function apiTemplateRender(template, data, dynamic) {
-    return _apiInvoke('templateRender', {data, template, dynamic});
-}
-
 function apiAudioGetUrl(definition, source, optionsContext) {
     return _apiInvoke('audioGetUrl', {definition, source, optionsContext});
 }
-- 
cgit v1.2.3


From 0e6b75438a88456eb0a19bf0fc54bae5d2ec4485 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:24:54 -0500
Subject: Use Map for Translator.tagCache

---
 ext/bg/js/translator.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 6d5dd50a..3471cb01 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -27,7 +27,7 @@ class Translator {
     constructor() {
         this.database = null;
         this.deinflector = null;
-        this.tagCache = {};
+        this.tagCache = new Map();
     }
 
     async prepare() {
@@ -44,12 +44,12 @@ class Translator {
     }
 
     async purgeDatabase() {
-        this.tagCache = {};
+        this.tagCache.clear();
         await this.database.purge();
     }
 
     async deleteDictionary(dictionaryName) {
-        this.tagCache = {};
+        this.tagCache.clear();
         await this.database.deleteDictionary(dictionaryName);
     }
 
@@ -537,22 +537,22 @@ class Translator {
 
     async getTagMetaList(names, title) {
         const tagMetaList = [];
-        const cache = (
-            hasOwn(this.tagCache, title) ?
-            this.tagCache[title] :
-            (this.tagCache[title] = {})
-        );
+        let cache = this.tagCache.get(title);
+        if (typeof cache === 'undefined') {
+            cache = new Map();
+            this.tagCache.set(title, cache);
+        }
 
         for (const name of names) {
             const base = Translator.getNameBase(name);
 
-            if (hasOwn(cache, base)) {
-                tagMetaList.push(cache[base]);
-            } else {
-                const tagMeta = await this.database.findTagForTitle(base, title);
-                cache[base] = tagMeta;
-                tagMetaList.push(tagMeta);
+            let tagMeta = cache.get(base);
+            if (typeof tagMeta === 'undefined') {
+                tagMeta = await this.database.findTagForTitle(base, title);
+                cache.set(base, tagMeta);
             }
+
+            tagMetaList.push(tagMeta);
         }
 
         return tagMetaList;
-- 
cgit v1.2.3


From 75fbb1565cb9046b83c32df5f4211a62ef355067 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:26:48 -0500
Subject: Use Map for audioGetFromSources's cache parameter

---
 ext/mixed/js/audio.js   | 9 ++++++---
 ext/mixed/js/display.js | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
index 76a3e7da..47db5c75 100644
--- a/ext/mixed/js/audio.js
+++ b/ext/mixed/js/audio.js
@@ -114,8 +114,11 @@ function audioGetFromUrl(url, willDownload) {
 
 async function audioGetFromSources(expression, sources, optionsContext, willDownload, cache=null) {
     const key = `${expression.expression}:${expression.reading}`;
-    if (cache !== null && hasOwn(cache, expression)) {
-        return cache[key];
+    if (cache !== null) {
+        const cacheValue = cache.get(expression);
+        if (typeof cacheValue !== 'undefined') {
+            return cacheValue;
+        }
     }
 
     for (let i = 0, ii = sources.length; i < ii; ++i) {
@@ -133,7 +136,7 @@ async function audioGetFromSources(expression, sources, optionsContext, willDown
             }
             const result = {audio, url, source};
             if (cache !== null) {
-                cache[key] = result;
+                cache.set(key, result);
             }
             return result;
         } catch (e) {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index b18e275d..5b868df3 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -32,7 +32,7 @@ class Display {
         this.index = 0;
         this.audioPlaying = null;
         this.audioFallback = null;
-        this.audioCache = {};
+        this.audioCache = new Map();
         this.styleNode = null;
 
         this.eventListeners = [];
-- 
cgit v1.2.3


From db1da33321a2517cc230c78f2b5c1ce9532aca0c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:28:59 -0500
Subject: Use Array.from in toIterable

---
 ext/mixed/js/core.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index ca9e98e5..c273bb87 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -113,11 +113,7 @@ function toIterable(value) {
     if (value !== null && typeof value === 'object') {
         const length = value.length;
         if (typeof length === 'number' && Number.isFinite(length)) {
-            const array = [];
-            for (let i = 0; i < length; ++i) {
-                array.push(value[i]);
-            }
-            return array;
+            return Array.from(value);
         }
     }
 
-- 
cgit v1.2.3


From 483f7401b749a38673e2abbdbb9d8d16c889d075 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:42:25 -0500
Subject: Validate bounds of Display.definitions before using

---
 ext/mixed/js/display.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 5b868df3..00f6d512 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -179,13 +179,15 @@ class Display {
         e.preventDefault();
         const link = e.currentTarget;
         const entry = link.closest('.entry');
-        const definitionIndex = this.entryIndexFind(entry);
+        const index = this.entryIndexFind(entry);
+        if (index < 0 || index >= this.definitions.length) { return; }
+
         const expressionIndex = Display.indexOf(entry.querySelectorAll('.term-expression .action-play-audio'), link);
         this.audioPlay(
-            this.definitions[definitionIndex],
+            this.definitions[index],
             // expressionIndex is used in audioPlay to detect result output mode
             Math.max(expressionIndex, this.options.general.resultOutputMode === 'merge' ? 0 : -1),
-            definitionIndex
+            index
         );
     }
 
@@ -193,6 +195,8 @@ class Display {
         e.preventDefault();
         const link = e.currentTarget;
         const index = this.entryIndexFind(link);
+        if (index < 0 || index >= this.definitions.length) { return; }
+
         this.noteAdd(this.definitions[index], link.dataset.mode);
     }
 
@@ -512,6 +516,8 @@ class Display {
     }
 
     autoPlayAudio() {
+        if (this.definitions.length === 0) { return; }
+
         this.audioPlay(this.definitions[0], this.firstExpressionIndex, 0);
     }
 
@@ -611,9 +617,12 @@ class Display {
     }
 
     noteTryAdd(mode) {
-        const button = this.adderButtonFind(this.index, mode);
+        const index = this.index;
+        if (index < 0 || index >= this.definitions.length) { return; }
+
+        const button = this.adderButtonFind(index, mode);
         if (button !== null && !button.classList.contains('disabled')) {
-            this.noteAdd(this.definitions[this.index], mode);
+            this.noteAdd(this.definitions[index], mode);
         }
     }
 
@@ -915,9 +924,12 @@ Display._onKeyDownHandlers = new Map([
 
     ['P', (self, e) => {
         if (e.altKey) {
-            const entry = self.getEntry(self.index);
+            const index = self.index;
+            if (index < 0 || index >= self.definitions.length) { return; }
+
+            const entry = self.getEntry(index);
             if (entry !== null && entry.dataset.type === 'term') {
-                self.audioPlay(self.definitions[self.index], self.firstExpressionIndex, self.index);
+                self.audioPlay(self.definitions[index], self.firstExpressionIndex, index);
             }
             return true;
         }
-- 
cgit v1.2.3


From 6194f9f585e268f2bbe8a3e70ac4deb59bc6a5e6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:44:08 -0500
Subject: Comma

---
 ext/fg/float.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/float.html b/ext/fg/float.html
index bec5ae68..082755f5 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -35,7 +35,7 @@
                 <h1>Yomichan Updated!</h1>
                 <p>
                     The Yomichan extension has been updated to a new version! In order to continue
-                    viewing definitions on this page you must reload this tab or restart your browser.
+                    viewing definitions on this page, you must reload this tab or restart your browser.
                 </p>
             </div>
         </div>
-- 
cgit v1.2.3


From 548c67ef1ce2a0aa8859dc458e003a98ad5b9ed6 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Fri, 14 Feb 2020 23:17:21 +0200
Subject: remove extra setContentToken check from Display

---
 ext/mixed/js/display.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 178567ab..e4be4c83 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -367,8 +367,6 @@ class Display {
             window.focus();
         }
 
-        if (this.setContentToken !== token) { return; }
-
         this.definitions = definitions;
         if (context.disableHistory) {
             delete context.disableHistory;
@@ -427,8 +425,6 @@ class Display {
             window.focus();
         }
 
-        if (this.setContentToken !== token) { return; }
-
         this.definitions = definitions;
         if (context.disableHistory) {
             delete context.disableHistory;
-- 
cgit v1.2.3


From 61c6a753ce964700e3ef9f6db6bb1137204caf46 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:11:40 -0500
Subject: Add apiTemplateRender back to mixed api.js

---
 ext/mixed/js/api.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 8eea0628..715c8286 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -65,6 +65,10 @@ function apiNoteView(noteId) {
     return _apiInvoke('noteView', {noteId});
 }
 
+function apiTemplateRender(template, data) {
+    return _apiInvoke('templateRender', {data, template});
+}
+
 function apiAudioGetUrl(definition, source, optionsContext) {
     return _apiInvoke('audioGetUrl', {definition, source, optionsContext});
 }
-- 
cgit v1.2.3


From 4dd4926672b4db39721c10a3941246ab1225f988 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:51:10 -0500
Subject: Remove unused apiGetDisplayTemplatesHtml and
 apiGetQueryParserTemplatesHtml

---
 ext/bg/js/api.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 4f1595c7..0c244ffa 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -25,18 +25,10 @@ function apiAudioGetUrl(definition, source, optionsContext) {
     return _apiInvoke('audioGetUrl', {definition, source, optionsContext});
 }
 
-function apiGetDisplayTemplatesHtml() {
-    return _apiInvoke('getDisplayTemplatesHtml');
-}
-
 function apiClipboardGet() {
     return _apiInvoke('clipboardGet');
 }
 
-function apiGetQueryParserTemplatesHtml() {
-    return _apiInvoke('getQueryParserTemplatesHtml');
-}
-
 function _apiInvoke(action, params={}) {
     const data = {action, params};
     return new Promise((resolve, reject) => {
-- 
cgit v1.2.3


From 89cb98e4d14ad4980133f8e8e44b15d56c3ebea5 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 14 Feb 2020 21:50:17 -0500
Subject: Add global apiForward

---
 ext/fg/js/float.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 418c69b6..46d1314e 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global popupNestedInitialize, Display*/
+/*global popupNestedInitialize, apiForward, Display*/
 
 class DisplayFloat extends Display {
     constructor() {
-- 
cgit v1.2.3


From faf15c08aa6777d1ae2d112c55659e08d53156c6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:34:44 -0500
Subject: Rename optionsUpdate event to optionsUpdated

Past tense better indicates that the options were changed, but no data
is being included as part of the event. It is also more consistent with
the other event names the yomichan object currently provides.
---
 ext/bg/js/backend.js       | 2 +-
 ext/bg/js/settings/main.js | 4 ++--
 ext/fg/js/frontend.js      | 2 +-
 ext/mixed/js/core.js       | 6 +++---
 ext/mixed/js/display.js    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index da50bade..d1a34f82 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -88,7 +88,7 @@ class Backend {
         const callback = () => this.checkLastError(chrome.runtime.lastError);
         chrome.tabs.query({}, (tabs) => {
             for (const tab of tabs) {
-                chrome.tabs.sendMessage(tab.id, {action: 'optionsUpdate', params: {source}}, callback);
+                chrome.tabs.sendMessage(tab.id, {action: 'optionsUpdated', params: {source}}, callback);
             }
         });
     }
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 1ba4a7ef..c6683427 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -242,7 +242,7 @@ async function settingsSaveOptions() {
     await apiOptionsSave(source);
 }
 
-async function onOptionsUpdate({source}) {
+async function onOptionsUpdated({source}) {
     const thisSource = await settingsGetSource();
     if (source === thisSource) { return; }
 
@@ -274,7 +274,7 @@ async function onReady() {
 
     storageInfoInitialize();
 
-    yomichan.on('optionsUpdate', onOptionsUpdate);
+    yomichan.on('optionsUpdated', onOptionsUpdated);
 }
 
 $(document).ready(() => onReady());
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index a620fb03..c3050514 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -56,7 +56,7 @@ class Frontend extends TextScanner {
             }
 
             yomichan.on('orphaned', () => this.onOrphaned());
-            yomichan.on('optionsUpdate', () => this.updateOptions());
+            yomichan.on('optionsUpdated', () => this.updateOptions());
             yomichan.on('zoomChanged', (e) => this.onZoomChanged(e));
             chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this));
 
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index c273bb87..2dd9cf40 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -248,7 +248,7 @@ const yomichan = (() => {
 
             this._messageHandlers = new Map([
                 ['getUrl', this._onMessageGetUrl.bind(this)],
-                ['optionsUpdate', this._onMessageOptionsUpdate.bind(this)],
+                ['optionsUpdated', this._onMessageOptionsUpdated.bind(this)],
                 ['zoomChanged', this._onMessageZoomChanged.bind(this)]
             ]);
 
@@ -276,8 +276,8 @@ const yomichan = (() => {
             return {url: window.location.href};
         }
 
-        _onMessageOptionsUpdate({source}) {
-            this.trigger('optionsUpdate', {source});
+        _onMessageOptionsUpdated({source}) {
+            this.trigger('optionsUpdated', {source});
         }
 
         _onMessageZoomChanged({oldZoomFactor, newZoomFactor}) {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 90b7aaf3..045ce906 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -52,7 +52,7 @@ class Display {
         const displayGeneratorPromise = this.displayGenerator.prepare();
         const updateOptionsPromise = this.updateOptions(options);
         await Promise.all([displayGeneratorPromise, updateOptionsPromise]);
-        yomichan.on('optionsUpdate', () => this.updateOptions(null));
+        yomichan.on('optionsUpdated', () => this.updateOptions(null));
     }
 
     onError(_error) {
-- 
cgit v1.2.3


From 496d2599ea6d9607b554641ded77cc82a6b9df42 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:33:20 -0500
Subject: Move error handling for apiDefinitionsAddable

---
 ext/mixed/js/api.js     |  2 +-
 ext/mixed/js/display.js | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 715c8286..86bdc73c 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -58,7 +58,7 @@ function apiDefinitionAdd(definition, mode, context, optionsContext) {
 }
 
 function apiDefinitionsAddable(definitions, modes, optionsContext) {
-    return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext}).catch(() => null);
+    return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext});
 }
 
 function apiNoteView(noteId) {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 045ce906..5c010747 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -414,7 +414,7 @@ class Display {
 
         this.setEventListenersActive(true);
 
-        const states = await apiDefinitionsAddable(definitions, ['term-kanji', 'term-kana'], this.getOptionsContext());
+        const states = await this.getDefinitionsAddable(definitions, ['term-kanji', 'term-kana']);
         if (this.setContentToken !== token) { return; }
 
         this.updateAdderButtons(states);
@@ -463,7 +463,7 @@ class Display {
 
         this.setEventListenersActive(true);
 
-        const states = await apiDefinitionsAddable(definitions, ['kanji'], this.getOptionsContext());
+        const states = await this.getDefinitionsAddable(definitions, ['kanji']);
         if (this.setContentToken !== token) { return; }
 
         this.updateAdderButtons(states);
@@ -776,6 +776,14 @@ class Display {
         return entry !== null ? entry.querySelector('.action-play-audio>img') : null;
     }
 
+    async getDefinitionsAddable(definitions, modes) {
+        try {
+            return await apiDefinitionsAddable(definitions, modes, this.getOptionsContext());
+        } catch (e) {
+            return [];
+        }
+    }
+
     static delay(time) {
         return new Promise((resolve) => setTimeout(resolve, time));
     }
-- 
cgit v1.2.3


From c5cbf99e89a89bfb684964328db3093c7ce07fd7 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:35:51 -0500
Subject: Use promiseTimeout instead of delay

---
 ext/mixed/js/display.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 5c010747..400a83c0 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -707,7 +707,7 @@ class Display {
     async getScreenshot() {
         try {
             await this.setPopupVisibleOverride(false);
-            await Display.delay(1); // Wait for popup to be hidden.
+            await promiseTimeout(1); // Wait for popup to be hidden.
 
             const {format, quality} = this.options.anki.screenshot;
             const dataUrl = await apiScreenshotGet({format, quality});
@@ -784,10 +784,6 @@ class Display {
         }
     }
 
-    static delay(time) {
-        return new Promise((resolve) => setTimeout(resolve, time));
-    }
-
     static indexOf(nodeList, node) {
         for (let i = 0, ii = nodeList.length; i < ii; ++i) {
             if (nodeList[i] === node) {
-- 
cgit v1.2.3


From 217bd36abc08e03eff21144122e0bacff90e856f Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:36:46 -0500
Subject: Use consistent timeout for both setContentTerms and setContentKanji

---
 ext/mixed/js/display.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 400a83c0..e914b082 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -450,7 +450,7 @@ class Display {
 
         for (let i = 0, ii = definitions.length; i < ii; ++i) {
             if (i > 0) {
-                await promiseTimeout(0);
+                await promiseTimeout(1);
                 if (this.setContentToken !== token) { return; }
             }
 
-- 
cgit v1.2.3


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(-)

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 912d59d3dfefde5738b4244d74d944795edcc02c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 22:39:09 -0500
Subject: Obscure the iframe's URL from the host page

---
 ext/fg/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index d077b1f8..55f3e0aa 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -39,7 +39,6 @@ class Popup {
         this._container.className = 'yomichan-float';
         this._container.addEventListener('mousedown', (e) => e.stopPropagation());
         this._container.addEventListener('scroll', (e) => e.stopPropagation());
-        this._container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
         this._container.style.width = '0px';
         this._container.style.height = '0px';
 
@@ -240,6 +239,7 @@ class Popup {
             this._observeFullscreen();
             this._onFullscreenChanged();
             this.setCustomOuterCss(this._options.general.customPopupOuterCss, false);
+            this._container.contentDocument.location.href = chrome.runtime.getURL('/fg/float.html');
         });
     }
 
-- 
cgit v1.2.3


From 42f1c2463c8051d9cbbcacd43f06922c2f11ec71 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 11:59:17 -0500
Subject: Move generateId function

---
 ext/fg/js/frontend-api-sender.js | 10 +---------
 ext/mixed/js/core.js             | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ext/fg/js/frontend-api-sender.js b/ext/fg/js/frontend-api-sender.js
index 93c2e593..8dc6aaf3 100644
--- a/ext/fg/js/frontend-api-sender.js
+++ b/ext/fg/js/frontend-api-sender.js
@@ -19,7 +19,7 @@
 
 class FrontendApiSender {
     constructor() {
-        this.senderId = FrontendApiSender.generateId(16);
+        this.senderId = yomichan.generateId(16);
         this.ackTimeout = 3000; // 3 seconds
         this.responseTimeout = 10000; // 10 seconds
         this.callbacks = new Map();
@@ -123,12 +123,4 @@ class FrontendApiSender {
         info.timer = null;
         info.reject(new Error(reason));
     }
-
-    static generateId(length) {
-        let id = '';
-        for (let i = 0; i < length; ++i) {
-            id += Math.floor(Math.random() * 256).toString(16).padStart(2, '0');
-        }
-        return id;
-    }
 }
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index 2dd9cf40..b6ecb48b 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -257,6 +257,16 @@ const yomichan = (() => {
 
         // Public
 
+        generateId(length) {
+            const array = new Uint8Array(length);
+            window.crypto.getRandomValues(array);
+            let id = '';
+            for (const value of array) {
+                id += value.toString(16).padStart(2, '0');
+            }
+            return id;
+        }
+
         triggerOrphaned(error) {
             this.trigger('orphaned', {error});
         }
-- 
cgit v1.2.3


From b5d32c73e657c882ba6f70b79d4a5e214684f563 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 12:23:20 -0500
Subject: Simplify process to wait for iframe prepare completion

---
 ext/fg/js/float.js            |  6 +++---
 ext/fg/js/frontend.js         |  3 +--
 ext/fg/js/popup-proxy-host.js |  8 +-------
 ext/fg/js/popup-proxy.js      |  5 -----
 ext/fg/js/popup.js            | 30 +++++++++++++++++++++++-------
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 46d1314e..35a78d48 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -34,7 +34,7 @@ class DisplayFloat extends Display {
         window.addEventListener('message', (e) => this.onMessage(e), false);
     }
 
-    async prepare(options, popupInfo, url, childrenSupported, scale) {
+    async prepare(options, popupInfo, url, childrenSupported, scale, uniqueId) {
         await super.prepare(options);
 
         const {id, depth, parentFrameId} = popupInfo;
@@ -47,7 +47,7 @@ class DisplayFloat extends Display {
 
         this.setContentScale(scale);
 
-        apiForward('popupSetDisplayInitialized');
+        apiForward('popupPrepareCompleted', {uniqueId});
     }
 
     onError(error) {
@@ -125,7 +125,7 @@ DisplayFloat._messageHandlers = new Map([
     ['setContent', (self, {type, details}) => self.setContent(type, details)],
     ['clearAutoPlayTimer', (self) => self.clearAutoPlayTimer()],
     ['setCustomCss', (self, {css}) => self.setCustomCss(css)],
-    ['initialize', (self, {options, popupInfo, url, childrenSupported, scale}) => self.prepare(options, popupInfo, url, childrenSupported, scale)],
+    ['prepare', (self, {options, popupInfo, url, childrenSupported, scale, uniqueId}) => self.prepare(options, popupInfo, url, childrenSupported, scale, uniqueId)],
     ['setContentScale', (self, {scale}) => self.setContentScale(scale)]
 ]);
 
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index c3050514..67045241 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -244,6 +244,5 @@ Frontend._windowMessageHandlers = new Map([
 ]);
 
 Frontend._runtimeMessageHandlers = new Map([
-    ['popupSetVisibleOverride', (self, {visible}) => { self.popup.setVisibleOverride(visible); }],
-    ['popupSetDisplayInitialized', (self) => { self.popup.setDisplayInitialized(); }]
+    ['popupSetVisibleOverride', (self, {visible}) => { self.popup.setVisibleOverride(visible); }]
 ]);
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index f6a3d451..98729796 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -43,8 +43,7 @@ class PopupProxyHost {
             ['showContent', ({id, elementRect, writingMode, type, details}) => this._onApiShowContent(id, elementRect, writingMode, type, details)],
             ['setCustomCss', ({id, css}) => this._onApiSetCustomCss(id, css)],
             ['clearAutoPlayTimer', ({id}) => this._onApiClearAutoPlayTimer(id)],
-            ['setContentScale', ({id, scale}) => this._onApiSetContentScale(id, scale)],
-            ['setDisplayInitialized', ({id}) => this._onApiSetDisplayInitialized(id)]
+            ['setContentScale', ({id, scale}) => this._onApiSetContentScale(id, scale)]
         ]));
     }
 
@@ -105,11 +104,6 @@ class PopupProxyHost {
         return popup.setContentScale(scale);
     }
 
-    async _onApiSetDisplayInitialized(id) {
-        const popup = this._getPopup(id);
-        return popup.setDisplayInitialized();
-    }
-
     // Private functions
 
     _createPopupInternal(parentId, depth) {
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index 6f3c0f1c..db6dffb1 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -103,11 +103,6 @@ class PopupProxy {
         this._invokeHostApi('setContentScale', {id, scale});
     }
 
-    async setDisplayInitialized() {
-        const id = await this._getPopupId();
-        this._invokeHostApi('setDisplayInitialized', {id});
-    }
-
     // Private
 
     _getPopupId() {
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 55f3e0aa..5f6a777b 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -123,10 +123,6 @@ class Popup {
         this._invokeApi('setContentScale', {scale});
     }
 
-    setDisplayInitialized() {
-        throw new Error('Override me');
-    }
-
     // Popup-only public functions
 
     setParent(parent) {
@@ -223,7 +219,10 @@ class Popup {
         return new Promise((resolve) => {
             const parentFrameId = (typeof this._frameId === 'number' ? this._frameId : null);
             this._container.addEventListener('load', () => {
-                this._invokeApi('initialize', {
+                const uniqueId = yomichan.generateId(32);
+                Popup._listenForDisplayPrepareCompleted(uniqueId, resolve);
+
+                this._invokeApi('prepare', {
                     options: this._options,
                     popupInfo: {
                         id: this._id,
@@ -232,9 +231,9 @@ class Popup {
                     },
                     url: this.url,
                     childrenSupported: this._childrenSupported,
-                    scale: this._contentScale
+                    scale: this._contentScale,
+                    uniqueId
                 });
-                this.setDisplayInitialized = resolve;
             });
             this._observeFullscreen();
             this._onFullscreenChanged();
@@ -357,6 +356,23 @@ class Popup {
         }
     }
 
+    static _listenForDisplayPrepareCompleted(uniqueId, resolve) {
+        const runtimeMessageCallback = ({action, params}, sender, callback) => {
+            if (
+                action === 'popupPrepareCompleted' &&
+                typeof params === 'object' &&
+                params !== null &&
+                params.uniqueId === uniqueId
+            ) {
+                chrome.runtime.onMessage.removeListener(runtimeMessageCallback);
+                callback();
+                resolve();
+                return false;
+            }
+        };
+        chrome.runtime.onMessage.addListener(runtimeMessageCallback);
+    }
+
     static _getPositionForHorizontalText(elementRect, width, height, viewport, offsetScale, optionsGeneral) {
         const preferBelow = (optionsGeneral.popupHorizontalTextPosition === 'below');
         const horizontalOffset = optionsGeneral.popupHorizontalOffset * offsetScale;
-- 
cgit v1.2.3


From 6df5220e0249fa06865034a44c690f7c640a38ed Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 12:23:40 -0500
Subject: Prevent multiple prepare calls

---
 ext/fg/js/float.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 35a78d48..440a9731 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -29,12 +29,16 @@ class DisplayFloat extends Display {
         };
 
         this._orphaned = false;
+        this._prepareInvoked = false;
 
         yomichan.on('orphaned', () => this.onOrphaned());
         window.addEventListener('message', (e) => this.onMessage(e), false);
     }
 
     async prepare(options, popupInfo, url, childrenSupported, scale, uniqueId) {
+        if (this._prepareInvoked) { return; }
+        this._prepareInvoked = true;
+
         await super.prepare(options);
 
         const {id, depth, parentFrameId} = popupInfo;
-- 
cgit v1.2.3


From cc989f44113e7961ae0ebdd8b780a636a646f5c3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 14:08:45 -0500
Subject: Add "match_about_blank": true to manifest

---
 ext/manifest.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/manifest.json b/ext/manifest.json
index 79097674..68a8adb4 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -31,6 +31,7 @@
             "fg/js/frontend-initialize.js"
         ],
         "css": ["fg/css/client.css"],
+        "match_about_blank": true,
         "all_frames": true
     }],
     "minimum_chrome_version": "57.0.0.0",
-- 
cgit v1.2.3


From 36605f74c3d48a98500d198636112454b36063f6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 18:47:46 -0500
Subject: Undo "Obscure the iframe's URL from the host page"

There are some additional issues which cause the frame to be reset to
about:blank on certain occasions which must be fixed before this can be
used.
---
 ext/fg/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 5f6a777b..211b649e 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -238,7 +238,7 @@ class Popup {
             this._observeFullscreen();
             this._onFullscreenChanged();
             this.setCustomOuterCss(this._options.general.customPopupOuterCss, false);
-            this._container.contentDocument.location.href = chrome.runtime.getURL('/fg/float.html');
+            this._container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
         });
     }
 
-- 
cgit v1.2.3


From 070ae70f7cd635f2b8742a6c406d1ef7b09ccc51 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 16:33:48 -0500
Subject: Create EventListenerCollection class

---
 .eslintrc.json                     |  1 +
 ext/bg/js/settings/dictionaries.js | 24 ++++------------
 ext/mixed/js/core.js               | 23 +++++++++++++++
 ext/mixed/js/display.js            | 59 ++++++++++++++++++--------------------
 ext/mixed/js/text-scanner.js       | 24 ++++------------
 5 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index d4ae215b..bda308e2 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,6 +51,7 @@
                 "stringReplaceAsync": "readonly",
                 "parseUrl": "readonly",
                 "EventDispatcher": "readonly",
+                "EventListenerCollection": "readonly",
                 "EXTENSION_IS_BROWSER_EDGE": "readonly"
             }
         },
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index fb459404..adad76fb 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -179,7 +179,7 @@ class SettingsDictionaryEntryUI {
         this.dictionaryInfo = dictionaryInfo;
         this.optionsDictionary = optionsDictionary;
         this.counts = null;
-        this.eventListeners = [];
+        this.eventListeners = new EventListenerCollection();
         this.isDeleting = false;
 
         this.content = content;
@@ -198,10 +198,10 @@ class SettingsDictionaryEntryUI {
 
         this.applyValues();
 
-        this.addEventListener(this.enabledCheckbox, 'change', (e) => this.onEnabledChanged(e), false);
-        this.addEventListener(this.allowSecondarySearchesCheckbox, 'change', (e) => this.onAllowSecondarySearchesChanged(e), false);
-        this.addEventListener(this.priorityInput, 'change', (e) => this.onPriorityChanged(e), false);
-        this.addEventListener(this.deleteButton, 'click', (e) => this.onDeleteButtonClicked(e), false);
+        this.eventListeners.addEventListener(this.enabledCheckbox, 'change', (e) => this.onEnabledChanged(e), false);
+        this.eventListeners.addEventListener(this.allowSecondarySearchesCheckbox, 'change', (e) => this.onAllowSecondarySearchesChanged(e), false);
+        this.eventListeners.addEventListener(this.priorityInput, 'change', (e) => this.onPriorityChanged(e), false);
+        this.eventListeners.addEventListener(this.deleteButton, 'click', (e) => this.onDeleteButtonClicked(e), false);
     }
 
     cleanup() {
@@ -212,7 +212,7 @@ class SettingsDictionaryEntryUI {
             this.content = null;
         }
         this.dictionaryInfo = null;
-        this.clearEventListeners();
+        this.eventListeners.removeAllEventListeners();
     }
 
     setCounts(counts) {
@@ -229,18 +229,6 @@ class SettingsDictionaryEntryUI {
         this.parent.save();
     }
 
-    addEventListener(node, type, listener, options) {
-        node.addEventListener(type, listener, options);
-        this.eventListeners.push([node, type, listener, options]);
-    }
-
-    clearEventListeners() {
-        for (const [node, type, listener, options] of this.eventListeners) {
-            node.removeEventListener(type, listener, options);
-        }
-        this.eventListeners = [];
-    }
-
     applyValues() {
         this.enabledCheckbox.checked = this.optionsDictionary.enabled;
         this.allowSecondarySearchesCheckbox.checked = this.optionsDictionary.allowSecondarySearches;
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index b6ecb48b..330a30fb 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -236,6 +236,29 @@ class EventDispatcher {
     }
 }
 
+class EventListenerCollection {
+    constructor() {
+        this._eventListeners = [];
+    }
+
+    get size() {
+        return this._eventListeners.length;
+    }
+
+    addEventListener(node, type, listener, options) {
+        node.addEventListener(type, listener, options);
+        this._eventListeners.push([node, type, listener, options]);
+    }
+
+    removeAllEventListeners() {
+        if (this._eventListeners.length === 0) { return; }
+        for (const [node, type, listener, options] of this._eventListeners) {
+            node.removeEventListener(type, listener, options);
+        }
+        this._eventListeners = [];
+    }
+}
+
 
 /*
  * Default message handlers
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index e914b082..8113260c 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -35,8 +35,8 @@ class Display {
         this.audioCache = new Map();
         this.styleNode = null;
 
-        this.eventListeners = [];
-        this.persistentEventListeners = [];
+        this.eventListeners = new EventListenerCollection();
+        this.persistentEventListeners = new EventListenerCollection();
         this.interactive = false;
         this.eventListenersActive = false;
         this.clickScanPrevent = false;
@@ -301,13 +301,23 @@ class Display {
         this.interactive = interactive;
 
         if (interactive) {
-            Display.addEventListener(this.persistentEventListeners, document, 'keydown', this.onKeyDown.bind(this), false);
-            Display.addEventListener(this.persistentEventListeners, document, 'wheel', this.onWheel.bind(this), {passive: false});
-            Display.addEventListener(this.persistentEventListeners, document.querySelector('.action-previous'), 'click', this.onSourceTermView.bind(this));
-            Display.addEventListener(this.persistentEventListeners, document.querySelector('.action-next'), 'click', this.onNextTermView.bind(this));
-            Display.addEventListener(this.persistentEventListeners, document.querySelector('.navigation-header'), 'wheel', this.onHistoryWheel.bind(this), {passive: false});
+            const actionPrevious = document.querySelector('.action-previous');
+            const actionNext = document.querySelector('.action-next');
+            const navigationHeader = document.querySelector('.navigation-header');
+
+            this.persistentEventListeners.addEventListener(document, 'keydown', this.onKeyDown.bind(this), false);
+            this.persistentEventListeners.addEventListener(document, 'wheel', this.onWheel.bind(this), {passive: false});
+            if (actionPrevious !== null) {
+                this.persistentEventListeners.addEventListener(actionPrevious, 'click', this.onSourceTermView.bind(this));
+            }
+            if (actionNext !== null) {
+                this.persistentEventListeners.addEventListener(actionNext, 'click', this.onNextTermView.bind(this));
+            }
+            if (navigationHeader !== null) {
+                this.persistentEventListeners.addEventListener(navigationHeader, 'wheel', this.onHistoryWheel.bind(this), {passive: false});
+            }
         } else {
-            Display.clearEventListeners(this.persistentEventListeners);
+            this.persistentEventListeners.removeAllEventListeners();
         }
         this.setEventListenersActive(this.eventListenersActive);
     }
@@ -318,23 +328,23 @@ class Display {
         this.eventListenersActive = active;
 
         if (active) {
-            this.addEventListeners('.action-add-note', 'click', this.onNoteAdd.bind(this));
-            this.addEventListeners('.action-view-note', 'click', this.onNoteView.bind(this));
-            this.addEventListeners('.action-play-audio', 'click', this.onAudioPlay.bind(this));
-            this.addEventListeners('.kanji-link', 'click', this.onKanjiLookup.bind(this));
+            this.addMultipleEventListeners('.action-add-note', 'click', this.onNoteAdd.bind(this));
+            this.addMultipleEventListeners('.action-view-note', 'click', this.onNoteView.bind(this));
+            this.addMultipleEventListeners('.action-play-audio', 'click', this.onAudioPlay.bind(this));
+            this.addMultipleEventListeners('.kanji-link', 'click', this.onKanjiLookup.bind(this));
             if (this.options.scanning.enablePopupSearch) {
-                this.addEventListeners('.term-glossary-item, .tag', 'mouseup', this.onGlossaryMouseUp.bind(this));
-                this.addEventListeners('.term-glossary-item, .tag', 'mousedown', this.onGlossaryMouseDown.bind(this));
-                this.addEventListeners('.term-glossary-item, .tag', 'mousemove', this.onGlossaryMouseMove.bind(this));
+                this.addMultipleEventListeners('.term-glossary-item, .tag', 'mouseup', this.onGlossaryMouseUp.bind(this));
+                this.addMultipleEventListeners('.term-glossary-item, .tag', 'mousedown', this.onGlossaryMouseDown.bind(this));
+                this.addMultipleEventListeners('.term-glossary-item, .tag', 'mousemove', this.onGlossaryMouseMove.bind(this));
             }
         } else {
-            Display.clearEventListeners(this.eventListeners);
+            this.eventListeners.removeAllEventListeners();
         }
     }
 
-    addEventListeners(selector, type, listener, options) {
+    addMultipleEventListeners(selector, type, listener, options) {
         for (const node of this.container.querySelectorAll(selector)) {
-            Display.addEventListener(this.eventListeners, node, type, listener, options);
+            this.eventListeners.addEventListener(node, type, listener, options);
         }
     }
 
@@ -793,19 +803,6 @@ class Display {
         return -1;
     }
 
-    static addEventListener(eventListeners, object, type, listener, options) {
-        if (object === null) { return; }
-        object.addEventListener(type, listener, options);
-        eventListeners.push([object, type, listener, options]);
-    }
-
-    static clearEventListeners(eventListeners) {
-        for (const [object, type, listener, options] of eventListeners) {
-            object.removeEventListener(type, listener, options);
-        }
-        eventListeners.length = 0;
-    }
-
     static getElementTop(element) {
         const elementRect = element.getBoundingClientRect();
         const documentRect = document.documentElement.getBoundingClientRect();
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index e6da1e5e..aa10bbaf 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -31,7 +31,7 @@ class TextScanner {
         this.options = null;
 
         this.enabled = false;
-        this.eventListeners = [];
+        this.eventListeners = new EventListenerCollection();
 
         this.primaryTouchIdentifier = null;
         this.preventNextContextMenu = false;
@@ -229,7 +229,7 @@ class TextScanner {
             }
         } else {
             if (this.enabled) {
-                this.clearEventListeners();
+                this.eventListeners.removeAllEventListeners();
                 this.enabled = false;
             }
             this.onSearchClear(false);
@@ -237,13 +237,13 @@ class TextScanner {
     }
 
     hookEvents() {
-        let eventListeners = this.getMouseEventListeners();
+        let eventListenerInfos = this.getMouseEventListeners();
         if (this.options.scanning.touchInputEnabled) {
-            eventListeners = eventListeners.concat(this.getTouchEventListeners());
+            eventListenerInfos = eventListenerInfos.concat(this.getTouchEventListeners());
         }
 
-        for (const [node, type, listener, options] of eventListeners) {
-            this.addEventListener(node, type, listener, options);
+        for (const [node, type, listener, options] of eventListenerInfos) {
+            this.eventListeners.addEventListener(node, type, listener, options);
         }
     }
 
@@ -268,18 +268,6 @@ class TextScanner {
         ];
     }
 
-    addEventListener(node, type, listener, options) {
-        node.addEventListener(type, listener, options);
-        this.eventListeners.push([node, type, listener, options]);
-    }
-
-    clearEventListeners() {
-        for (const [node, type, listener, options] of this.eventListeners) {
-            node.removeEventListener(type, listener, options);
-        }
-        this.eventListeners = [];
-    }
-
     setOptions(options) {
         this.options = options;
         this.setEnabled(this.options.general.enable);
-- 
cgit v1.2.3


From 5d3c13ee98c49de8b3bd57892d93bd4eca2cf7ee Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 18:52:04 -0500
Subject: Tweak how fullscreen changes are observed

---
 ext/fg/js/popup.js | 56 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 211b649e..0fc40475 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -42,6 +42,8 @@ class Popup {
         this._container.style.width = '0px';
         this._container.style.height = '0px';
 
+        this._fullscreenEventListeners = new EventListenerCollection();
+
         this._updateVisibility();
     }
 
@@ -242,6 +244,36 @@ class Popup {
         });
     }
 
+    _observeFullscreen(observe) {
+        if (!observe) {
+            this._fullscreenEventListeners.removeAllEventListeners();
+            return;
+        }
+
+        if (this._fullscreenEventListeners.size > 0) {
+            // Already observing
+            return;
+        }
+
+        const fullscreenEvents = [
+            'fullscreenchange',
+            'MSFullscreenChange',
+            'mozfullscreenchange',
+            'webkitfullscreenchange'
+        ];
+        const onFullscreenChanged = () => this._onFullscreenChanged();
+        for (const eventName of fullscreenEvents) {
+            this._fullscreenEventListeners.addEventListener(document, eventName, onFullscreenChanged, false);
+        }
+    }
+
+    _onFullscreenChanged() {
+        const parent = (Popup._getFullscreenElement() || document.body || null);
+        if (parent !== null && this._container.parentNode !== parent) {
+            parent.appendChild(this._container);
+        }
+    }
+
     async _show(elementRect, writingMode) {
         await this._inject();
 
@@ -328,34 +360,16 @@ class Popup {
         }
     }
 
-    _observeFullscreen() {
-        const fullscreenEvents = [
-            'fullscreenchange',
-            'MSFullscreenChange',
-            'mozfullscreenchange',
-            'webkitfullscreenchange'
-        ];
-        for (const eventName of fullscreenEvents) {
-            document.addEventListener(eventName, () => this._onFullscreenChanged(), false);
-        }
-    }
-
-    _getFullscreenElement() {
+    static _getFullscreenElement() {
         return (
             document.fullscreenElement ||
             document.msFullscreenElement ||
             document.mozFullScreenElement ||
-            document.webkitFullscreenElement
+            document.webkitFullscreenElement ||
+            null
         );
     }
 
-    _onFullscreenChanged() {
-        const parent = (this._getFullscreenElement() || document.body || null);
-        if (parent !== null && this._container.parentNode !== parent) {
-            parent.appendChild(this._container);
-        }
-    }
-
     static _listenForDisplayPrepareCompleted(uniqueId, resolve) {
         const runtimeMessageCallback = ({action, params}, sender, callback) => {
             if (
-- 
cgit v1.2.3


From dcd243c9e9f3af3fedb0bb0db9795f377f175587 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 17:27:55 -0500
Subject: Update how popups are created

---
 ext/bg/js/settings/popup-preview-frame.js |  2 +-
 ext/fg/js/frontend-initialize.js          | 11 ++++--
 ext/fg/js/popup-proxy-host.js             | 64 +++++++++++++++++++++----------
 ext/fg/js/popup-proxy.js                  |  6 +--
 ext/fg/js/popup.js                        |  8 ++++
 5 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 042f335f..8fd06222 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -50,7 +50,7 @@ class SettingsPopupPreview {
         const popupHost = new PopupProxyHost();
         await popupHost.prepare();
 
-        const popup = popupHost.createPopup(null, 0);
+        const popup = popupHost.getOrCreatePopup();
         popup.setChildrenSupported(false);
 
         this.frontend = new Frontend(popup);
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index c32e97d4..54b874f2 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -22,13 +22,16 @@ async function main() {
     const data = window.frontendInitializationData || {};
     const {id, depth=0, parentFrameId, ignoreNodes, url, proxy=false} = data;
 
-    let popupHost = null;
-    if (!proxy) {
-        popupHost = new PopupProxyHost();
+    let popup;
+    if (proxy) {
+        popup = new PopupProxy(null, depth + 1, id, parentFrameId, url);
+    } else {
+        const popupHost = new PopupProxyHost();
         await popupHost.prepare();
+
+        popup = popupHost.getOrCreatePopup();
     }
 
-    const popup = proxy ? new PopupProxy(depth + 1, id, parentFrameId, url) : popupHost.createPopup(null, depth);
     const frontend = new Frontend(popup, ignoreNodes);
     await frontend.prepare();
 }
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index 98729796..e55801ff 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -34,7 +34,7 @@ class PopupProxyHost {
         if (typeof frameId !== 'number') { return; }
 
         this._apiReceiver = new FrontendApiReceiver(`popup-proxy-host#${frameId}`, new Map([
-            ['createNestedPopup', ({parentId}) => this._onApiCreateNestedPopup(parentId)],
+            ['getOrCreatePopup', ({id, parentId}) => this._onApiGetOrCreatePopup(id, parentId)],
             ['setOptions', ({id, options}) => this._onApiSetOptions(id, options)],
             ['hide', ({id, changeFocus}) => this._onApiHide(id, changeFocus)],
             ['isVisible', ({id}) => this._onApiIsVisibleAsync(id)],
@@ -47,14 +47,51 @@ class PopupProxyHost {
         ]));
     }
 
-    createPopup(parentId, depth) {
-        return this._createPopupInternal(parentId, depth).popup;
+    getOrCreatePopup(id=null, parentId=null) {
+        // Find by existing id
+        if (id !== null) {
+            const popup = this._popups.get(id);
+            if (typeof popup !== 'undefined') {
+                return popup;
+            }
+        }
+
+        // Find by existing parent id
+        let parent = null;
+        if (parentId !== null) {
+            parent = this._popups.get(parentId);
+            if (typeof parent !== 'undefined') {
+                const popup = parent.child;
+                if (popup !== null) {
+                    return popup;
+                }
+            } else {
+                parent = null;
+            }
+        }
+
+        // New unique id
+        if (id === null) {
+            id = this._nextId++;
+        }
+
+        // Create new popup
+        const depth = (parent !== null ? parent.depth + 1 : 0);
+        const popup = new Popup(id, depth, this._frameIdPromise);
+        if (parent !== null) {
+            popup.setParent(parent);
+        }
+        this._popups.set(id, popup);
+        return popup;
     }
 
     // Message handlers
 
-    async _onApiCreateNestedPopup(parentId) {
-        return this._createPopupInternal(parentId, 0).id;
+    async _onApiGetOrCreatePopup(id, parentId) {
+        const popup = this.getOrCreatePopup(id, parentId);
+        return {
+            id: popup.id
+        };
     }
 
     async _onApiSetOptions(id, options) {
@@ -106,25 +143,10 @@ class PopupProxyHost {
 
     // Private functions
 
-    _createPopupInternal(parentId, depth) {
-        const parent = (typeof parentId === 'string' && this._popups.has(parentId) ? this._popups.get(parentId) : null);
-        const id = `${this._nextId}`;
-        if (parent !== null) {
-            depth = parent.depth + 1;
-        }
-        ++this._nextId;
-        const popup = new Popup(id, depth, this._frameIdPromise);
-        if (parent !== null) {
-            popup.setParent(parent);
-        }
-        this._popups.set(id, popup);
-        return {popup, id};
-    }
-
     _getPopup(id) {
         const popup = this._popups.get(id);
         if (typeof popup === 'undefined') {
-            throw new Error('Invalid popup ID');
+            throw new Error(`Invalid popup ID ${id}`);
         }
         return popup;
     }
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index db6dffb1..093cdd2e 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -19,10 +19,10 @@
 /*global FrontendApiSender*/
 
 class PopupProxy {
-    constructor(depth, parentId, parentFrameId, url) {
+    constructor(id, depth, parentId, parentFrameId, url) {
         this._parentId = parentId;
         this._parentFrameId = parentFrameId;
-        this._id = null;
+        this._id = id;
         this._idPromise = null;
         this._depth = depth;
         this._url = url;
@@ -113,7 +113,7 @@ class PopupProxy {
     }
 
     async _getPopupIdAsync() {
-        const id = await this._invokeHostApi('createNestedPopup', {parentId: this._parentId});
+        const {id} = await this._invokeHostApi('getOrCreatePopup', {id: this._id, parentId: this._parentId});
         this._id = id;
         return id;
     }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 0fc40475..8d4d2b14 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -49,10 +49,18 @@ class Popup {
 
     // Public properties
 
+    get id() {
+        return this._id;
+    }
+
     get parent() {
         return this._parent;
     }
 
+    get child() {
+        return this._child;
+    }
+
     get depth() {
         return this._depth;
     }
-- 
cgit v1.2.3


From c6efa656268b93c612f3f4f9c5de0a2523506902 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 19:09:33 -0500
Subject: Fix missing argument

---
 ext/fg/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 8d4d2b14..de05f9f5 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -245,7 +245,7 @@ class Popup {
                     uniqueId
                 });
             });
-            this._observeFullscreen();
+            this._observeFullscreen(true);
             this._onFullscreenChanged();
             this.setCustomOuterCss(this._options.general.customPopupOuterCss, false);
             this._container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
-- 
cgit v1.2.3


From f019ab741abdc5ddcb9e5c483d86494c7929d8df Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 21:38:37 -0500
Subject: Update workflow definition

---
 .github/workflows/ci.yml     | 23 +++++++++++++++++++++++
 .github/workflows/nodejs.yml | 24 ------------------------
 2 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/nodejs.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..40bc005d
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup node
+      uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+    - name: Install dependencies
+      run: npm ci
+    - name: Build
+      run: npm run build --if-present
+    - name: Run tests
+      run: npm test
+      env:
+        CI: true
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
deleted file mode 100644
index 7c800f85..00000000
--- a/.github/workflows/nodejs.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Node.js CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [10.x, 12.x]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm run build --if-present
-    - run: npm test
-      env:
-        CI: true
-- 
cgit v1.2.3


From 1c6ed1d2866d9912b3b65d9e5addf710a6f26b38 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 19:16:31 -0500
Subject: Set URL before adding to the document

---
 ext/fg/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index de05f9f5..45203c03 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -228,6 +228,7 @@ class Popup {
 
         return new Promise((resolve) => {
             const parentFrameId = (typeof this._frameId === 'number' ? this._frameId : null);
+            this._container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
             this._container.addEventListener('load', () => {
                 const uniqueId = yomichan.generateId(32);
                 Popup._listenForDisplayPrepareCompleted(uniqueId, resolve);
@@ -248,7 +249,6 @@ class Popup {
             this._observeFullscreen(true);
             this._onFullscreenChanged();
             this.setCustomOuterCss(this._options.general.customPopupOuterCss, false);
-            this._container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
         });
     }
 
-- 
cgit v1.2.3


From 2c3f510010ca2910b8c227a9888e2c3584840402 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 13:13:04 -0500
Subject: Allow apiInjectStylesheet to inject a URL

---
 ext/bg/js/backend.js | 23 ++++++++++++++++-------
 ext/fg/js/popup.js   |  2 +-
 ext/mixed/js/api.js  |  4 ++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index d1a34f82..eeed841c 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -499,19 +499,28 @@ class Backend {
         return Promise.resolve({frameId});
     }
 
-    _onApiInjectStylesheet({css}, sender) {
+    _onApiInjectStylesheet({type, value}, sender) {
         if (!sender.tab) {
             return Promise.reject(new Error('Invalid tab'));
         }
 
         const tabId = sender.tab.id;
         const frameId = sender.frameId;
-        const details = {
-            code: css,
-            runAt: 'document_start',
-            cssOrigin: 'user',
-            allFrames: false
-        };
+        const details = (
+            type === 'file' ?
+            {
+                file: value,
+                runAt: 'document_start',
+                cssOrigin: 'author',
+                allFrames: false
+            } :
+            {
+                code: value,
+                runAt: 'document_start',
+                cssOrigin: 'user',
+                allFrames: false
+            }
+        );
         if (typeof frameId === 'number') {
             details.frameId = frameId;
         }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 45203c03..970c5343 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -167,7 +167,7 @@ class Popup {
         } else {
             if (!css) { return; }
             try {
-                await apiInjectStylesheet(css);
+                await apiInjectStylesheet('code', css);
                 this._stylesheetInjectedViaApi = true;
             } catch (e) {
                 // NOP
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 86bdc73c..14900ecf 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -89,8 +89,8 @@ function apiFrameInformationGet() {
     return _apiInvoke('frameInformationGet');
 }
 
-function apiInjectStylesheet(css) {
-    return _apiInvoke('injectStylesheet', {css});
+function apiInjectStylesheet(type, value) {
+    return _apiInvoke('injectStylesheet', {type, value});
 }
 
 function apiGetEnvironmentInfo() {
-- 
cgit v1.2.3


From b6a50e234cf4fc6179725082f9f53ddd7325ba01 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 13:29:55 -0500
Subject: Change parameter name

---
 ext/bg/js/settings/popup-preview-frame.js | 2 +-
 ext/fg/js/popup.js                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 8fd06222..a7863b3a 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -137,7 +137,7 @@ class SettingsPopupPreview {
 
     setCustomOuterCss(css) {
         if (this.frontend === null) { return; }
-        this.frontend.popup.setCustomOuterCss(css, true);
+        this.frontend.popup.setCustomOuterCss(css, false);
     }
 
     async updateSearch() {
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 970c5343..6fbab62b 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -158,11 +158,11 @@ class Popup {
         this._container.dataset.yomichanSiteColor = this._getSiteColor();
     }
 
-    async setCustomOuterCss(css, injectDirectly) {
+    async setCustomOuterCss(css, useWebExtensionApi) {
         // Cannot repeatedly inject stylesheets using web extension APIs since there is no way to remove them.
         if (this._stylesheetInjectedViaApi) { return; }
 
-        if (injectDirectly || Popup._isOnExtensionPage()) {
+        if (!useWebExtensionApi || Popup._isOnExtensionPage()) {
             Popup.injectOuterStylesheet(css);
         } else {
             if (!css) { return; }
-- 
cgit v1.2.3


From d3aefdc4e3f78b87b99bff576137f530ac7ac163 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 13:37:03 -0500
Subject: Override setCustomOuterCss instead of Popup.injectOuterStylesheet

---
 ext/bg/js/settings/popup-preview-frame.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index a7863b3a..8c354bf7 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -22,7 +22,8 @@ class SettingsPopupPreview {
     constructor() {
         this.frontend = null;
         this.apiOptionsGetOld = apiOptionsGet;
-        this.popupInjectOuterStylesheetOld = Popup.injectOuterStylesheet;
+        this.popup = null;
+        this.popupSetCustomOuterCssOld = null;
         this.popupShown = false;
         this.themeChangeTimeout = null;
         this.textSource = null;
@@ -50,19 +51,19 @@ class SettingsPopupPreview {
         const popupHost = new PopupProxyHost();
         await popupHost.prepare();
 
-        const popup = popupHost.getOrCreatePopup();
-        popup.setChildrenSupported(false);
+        this.popup = popupHost.getOrCreatePopup();
+        this.popup.setChildrenSupported(false);
 
-        this.frontend = new Frontend(popup);
+        this.popupSetCustomOuterCssOld = this.popup.setCustomOuterCss;
+        this.popup.setCustomOuterCss = (...args) => this.popupSetCustomOuterCss(...args);
+
+        this.frontend = new Frontend(this.popup);
 
         this.frontend.setEnabled = function () {};
         this.frontend.searchClear = function () {};
 
         await this.frontend.prepare();
 
-        // Overwrite popup
-        Popup.injectOuterStylesheet = (...args) => this.popupInjectOuterStylesheet(...args);
-
         // Update search
         this.updateSearch();
     }
@@ -83,9 +84,9 @@ class SettingsPopupPreview {
         return options;
     }
 
-    popupInjectOuterStylesheet(...args) {
+    async popupSetCustomOuterCss(...args) {
         // This simulates the stylesheet priorities when injecting using the web extension API.
-        const result = this.popupInjectOuterStylesheetOld(...args);
+        const result = await this.popupSetCustomOuterCssOld.call(this.popup, ...args);
 
         const outerStylesheet = Popup.outerStylesheet;
         const node = document.querySelector('#client-css');
-- 
cgit v1.2.3


From 9fd6ee382d35fb5fcfc3e6d0f4fab711b37b693e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 13:48:06 -0500
Subject: Create more generic function for injecting stylesheets

---
 ext/bg/js/settings/popup-preview-frame.js |   5 +-
 ext/fg/js/popup.js                        | 132 +++++++++++++++++++-----------
 2 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 8c354bf7..e900d4e2 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -88,10 +88,9 @@ class SettingsPopupPreview {
         // This simulates the stylesheet priorities when injecting using the web extension API.
         const result = await this.popupSetCustomOuterCssOld.call(this.popup, ...args);
 
-        const outerStylesheet = Popup.outerStylesheet;
         const node = document.querySelector('#client-css');
-        if (node !== null && outerStylesheet !== null) {
-            node.parentNode.insertBefore(outerStylesheet, node);
+        if (node !== null && result !== null) {
+            node.parentNode.insertBefore(result, node);
         }
 
         return result;
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 6fbab62b..d799e371 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -31,7 +31,6 @@ class Popup {
         this._visible = false;
         this._visibleOverride = null;
         this._options = null;
-        this._stylesheetInjectedViaApi = false;
         this._contentScale = 1.0;
         this._containerSizeContentScale = null;
 
@@ -159,20 +158,12 @@ class Popup {
     }
 
     async setCustomOuterCss(css, useWebExtensionApi) {
-        // Cannot repeatedly inject stylesheets using web extension APIs since there is no way to remove them.
-        if (this._stylesheetInjectedViaApi) { return; }
-
-        if (!useWebExtensionApi || Popup._isOnExtensionPage()) {
-            Popup.injectOuterStylesheet(css);
-        } else {
-            if (!css) { return; }
-            try {
-                await apiInjectStylesheet('code', css);
-                this._stylesheetInjectedViaApi = true;
-            } catch (e) {
-                // NOP
-            }
-        }
+        return await Popup._injectStylesheet(
+            'yomichan-popup-outer-user-stylesheet',
+            'code',
+            css,
+            useWebExtensionApi
+        );
     }
 
     setChildrenSupported(value) {
@@ -187,26 +178,6 @@ class Popup {
         return this._container.getBoundingClientRect();
     }
 
-    static injectOuterStylesheet(css) {
-        if (Popup.outerStylesheet === null) {
-            if (!css) { return; }
-            Popup.outerStylesheet = document.createElement('style');
-            Popup.outerStylesheet.id = 'yomichan-popup-outer-stylesheet';
-        }
-
-        const outerStylesheet = Popup.outerStylesheet;
-        if (css) {
-            outerStylesheet.textContent = css;
-
-            const par = document.head;
-            if (par && outerStylesheet.parentNode !== par) {
-                par.appendChild(outerStylesheet);
-            }
-        } else {
-            outerStylesheet.textContent = '';
-        }
-    }
-
     // Private functions
 
     _inject() {
@@ -248,7 +219,11 @@ class Popup {
             });
             this._observeFullscreen(true);
             this._onFullscreenChanged();
-            this.setCustomOuterCss(this._options.general.customPopupOuterCss, false);
+            try {
+                this.setCustomOuterCss(this._options.general.customPopupOuterCss, true);
+            } catch (e) {
+                // NOP
+            }
         });
     }
 
@@ -526,15 +501,6 @@ class Popup {
         ];
     }
 
-    static _isOnExtensionPage() {
-        try {
-            const url = chrome.runtime.getURL('/');
-            return window.location.href.substring(0, url.length) === url;
-        } catch (e) {
-            // NOP
-        }
-    }
-
     static _getViewport(useVisualViewport) {
         const visualViewport = window.visualViewport;
         if (visualViewport !== null && typeof visualViewport === 'object') {
@@ -567,6 +533,80 @@ class Popup {
             bottom: window.innerHeight
         };
     }
+
+    static _isOnExtensionPage() {
+        try {
+            const url = chrome.runtime.getURL('/');
+            return window.location.href.substring(0, url.length) === url;
+        } catch (e) {
+            // NOP
+        }
+    }
+
+    static async _injectStylesheet(id, type, value, useWebExtensionApi) {
+        const injectedStylesheets = Popup._injectedStylesheets;
+
+        if (Popup._isOnExtensionPage()) {
+            // Permissions error will occur if trying to use the WebExtension API to inject
+            // into an extension page.
+            useWebExtensionApi = false;
+        }
+
+        let styleNode = injectedStylesheets.get(id);
+        if (typeof styleNode !== 'undefined') {
+            if (styleNode === null) {
+                // Previously injected via WebExtension API
+                throw new Error(`Stylesheet with id ${id} has already been injected using the WebExtension API`);
+            }
+        } else {
+            styleNode = null;
+        }
+
+        if (useWebExtensionApi) {
+            // Inject via WebExtension API
+            if (styleNode !== null && styleNode.parentNode !== null) {
+                styleNode.parentNode.removeChild(styleNode);
+            }
+
+            await apiInjectStylesheet(type, value);
+
+            injectedStylesheets.set(id, null);
+            return null;
+        }
+
+        // Create node in document
+        const parentNode = document.head;
+        if (parentNode === null) {
+            throw new Error('No parent node');
+        }
+
+        // Create or reuse node
+        const isFile = (type === 'file');
+        const tagName = isFile ? 'link' : 'style';
+        if (styleNode === null || styleNode.nodeName.toLowerCase() !== tagName) {
+            if (styleNode !== null && styleNode.parentNode !== null) {
+                styleNode.parentNode.removeChild(styleNode);
+            }
+            styleNode = document.createElement(tagName);
+            styleNode.id = id;
+        }
+
+        // Update node style
+        if (isFile) {
+            styleNode.rel = value;
+        } else {
+            styleNode.textContent = value;
+        }
+
+        // Update parent
+        if (styleNode.parentNode !== parentNode) {
+            parentNode.appendChild(styleNode);
+        }
+
+        // Add to map
+        injectedStylesheets.set(id, styleNode);
+        return styleNode;
+    }
 }
 
-Popup.outerStylesheet = null;
+Popup._injectedStylesheets = new Map();
-- 
cgit v1.2.3


From 3d27e80ae646bcc9c421cbc8aa281008f47c8992 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 13:53:19 -0500
Subject: Delay CSS injection until a popup is created

---
 ext/fg/js/popup.js | 1 +
 ext/manifest.json  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index d799e371..dc538b02 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -220,6 +220,7 @@ class Popup {
             this._observeFullscreen(true);
             this._onFullscreenChanged();
             try {
+                Popup._injectStylesheet('yomichan-popup-outer-stylesheet', 'file', '/fg/css/client.css', true);
                 this.setCustomOuterCss(this._options.general.customPopupOuterCss, true);
             } catch (e) {
                 // NOP
diff --git a/ext/manifest.json b/ext/manifest.json
index 68a8adb4..b86459f9 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -30,7 +30,6 @@
             "fg/js/frontend.js",
             "fg/js/frontend-initialize.js"
         ],
-        "css": ["fg/css/client.css"],
         "match_about_blank": true,
         "all_frames": true
     }],
-- 
cgit v1.2.3


From e173a71ba631533a2a0a64ffe4d8883d7300802e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 14:34:49 -0500
Subject: Fix CSS injection on about:blank pages

---
 ext/bg/js/backend.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index eeed841c..458ea483 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -512,13 +512,15 @@ class Backend {
                 file: value,
                 runAt: 'document_start',
                 cssOrigin: 'author',
-                allFrames: false
+                allFrames: false,
+                matchAboutBlank: true
             } :
             {
                 code: value,
                 runAt: 'document_start',
                 cssOrigin: 'user',
-                allFrames: false
+                allFrames: false,
+                matchAboutBlank: true
             }
         );
         if (typeof frameId === 'number') {
-- 
cgit v1.2.3


From ae4ee9ddee0b791c1039595250db6106e66709fa Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 21:49:28 -0500
Subject: Fix error handling on style injection

---
 ext/fg/js/popup.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index dc538b02..59c46ab8 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -219,15 +219,24 @@ class Popup {
             });
             this._observeFullscreen(true);
             this._onFullscreenChanged();
-            try {
-                Popup._injectStylesheet('yomichan-popup-outer-stylesheet', 'file', '/fg/css/client.css', true);
-                this.setCustomOuterCss(this._options.general.customPopupOuterCss, true);
-            } catch (e) {
-                // NOP
-            }
+            this._injectStyles();
         });
     }
 
+    async _injectStyles() {
+        try {
+            await Popup._injectStylesheet('yomichan-popup-outer-stylesheet', 'file', '/fg/css/client.css', true);
+        } catch (e) {
+            // NOP
+        }
+
+        try {
+            await this.setCustomOuterCss(this._options.general.customPopupOuterCss, true);
+        } catch (e) {
+            // NOP
+        }
+    }
+
     _observeFullscreen(observe) {
         if (!observe) {
             this._fullscreenEventListeners.removeAllEventListeners();
-- 
cgit v1.2.3


From aee16c443195ff8ab2b0f5f5e8551e44895d48a1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 16 Feb 2020 23:41:17 -0500
Subject: Check origin on window messages

---
 ext/bg/js/settings/popup-preview-frame.js | 3 +++
 ext/bg/js/settings/popup-preview.js       | 8 +++++---
 ext/fg/js/popup.js                        | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index e900d4e2..890b8c96 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -27,6 +27,7 @@ class SettingsPopupPreview {
         this.popupShown = false;
         this.themeChangeTimeout = null;
         this.textSource = null;
+        this._targetOrigin = chrome.runtime.getURL('/').replace(/\/$/, '');
     }
 
     static create() {
@@ -97,6 +98,8 @@ class SettingsPopupPreview {
     }
 
     onMessage(e) {
+        if (e.origin !== this._targetOrigin) { return; }
+
         const {action, params} = e.data;
         const handler = SettingsPopupPreview._messageHandlers.get(action);
         if (typeof handler !== 'function') { return; }
diff --git a/ext/bg/js/settings/popup-preview.js b/ext/bg/js/settings/popup-preview.js
index 0d20471e..d1d2ff5e 100644
--- a/ext/bg/js/settings/popup-preview.js
+++ b/ext/bg/js/settings/popup-preview.js
@@ -40,20 +40,22 @@ function showAppearancePreview() {
 
     window.wanakana.bind(text[0]);
 
+    const targetOrigin = chrome.runtime.getURL('/').replace(/\/$/, '');
+
     text.on('input', () => {
         const action = 'setText';
         const params = {text: text.val()};
-        frame.contentWindow.postMessage({action, params}, '*');
+        frame.contentWindow.postMessage({action, params}, targetOrigin);
     });
     customCss.on('input', () => {
         const action = 'setCustomCss';
         const params = {css: customCss.val()};
-        frame.contentWindow.postMessage({action, params}, '*');
+        frame.contentWindow.postMessage({action, params}, targetOrigin);
     });
     customOuterCss.on('input', () => {
         const action = 'setCustomOuterCss';
         const params = {css: customOuterCss.val()};
-        frame.contentWindow.postMessage({action, params}, '*');
+        frame.contentWindow.postMessage({action, params}, targetOrigin);
     });
 
     container.append(frame);
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 59c46ab8..900e7325 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -33,6 +33,7 @@ class Popup {
         this._options = null;
         this._contentScale = 1.0;
         this._containerSizeContentScale = null;
+        this._targetOrigin = chrome.runtime.getURL('/').replace(/\/$/, '');
 
         this._container = document.createElement('iframe');
         this._container.className = 'yomichan-float';
@@ -349,7 +350,7 @@ class Popup {
 
     _invokeApi(action, params={}) {
         if (this._container.contentWindow) {
-            this._container.contentWindow.postMessage({action, params}, '*');
+            this._container.contentWindow.postMessage({action, params}, this._targetOrigin);
         }
     }
 
-- 
cgit v1.2.3


From 0f46e3a093e7f0c07ad310d8c17e2582bdfd2741 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 11:02:21 -0500
Subject: Use a token to ensure that messages are coming from Yomichan

---
 ext/bg/js/backend.js |  9 ++++++++-
 ext/fg/js/float.js   | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 ext/fg/js/popup.js   | 15 +++++++++++----
 ext/mixed/js/api.js  |  4 ++++
 4 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 458ea483..a4d085e0 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -46,6 +46,8 @@ class Backend {
         this.popupWindow = null;
 
         this.apiForwarder = new BackendApiForwarder();
+
+        this.messageToken = yomichan.generateId(16);
     }
 
     async prepare() {
@@ -614,6 +616,10 @@ class Backend {
         });
     }
 
+    async _onApiGetMessageToken() {
+        return this.messageToken;
+    }
+
     // Command handlers
 
     async _onCommandSearch(params) {
@@ -875,7 +881,8 @@ Backend._messageHandlers = new Map([
     ['clipboardGet', (self, ...args) => self._onApiClipboardGet(...args)],
     ['getDisplayTemplatesHtml', (self, ...args) => self._onApiGetDisplayTemplatesHtml(...args)],
     ['getQueryParserTemplatesHtml', (self, ...args) => self._onApiGetQueryParserTemplatesHtml(...args)],
-    ['getZoom', (self, ...args) => self._onApiGetZoom(...args)]
+    ['getZoom', (self, ...args) => self._onApiGetZoom(...args)],
+    ['getMessageToken', (self, ...args) => self._onApiGetMessageToken(...args)]
 ]);
 
 Backend._commandHandlers = new Map([
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 440a9731..8f21a9c5 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global popupNestedInitialize, apiForward, Display*/
+/*global popupNestedInitialize, apiForward, apiGetMessageToken, Display*/
 
 class DisplayFloat extends Display {
     constructor() {
@@ -30,6 +30,8 @@ class DisplayFloat extends Display {
 
         this._orphaned = false;
         this._prepareInvoked = false;
+        this._messageToken = null;
+        this._messageTokenPromise = null;
 
         yomichan.on('orphaned', () => this.onOrphaned());
         window.addEventListener('message', (e) => this.onMessage(e), false);
@@ -75,11 +77,23 @@ class DisplayFloat extends Display {
     }
 
     onMessage(e) {
-        const {action, params} = e.data;
-        const handler = DisplayFloat._messageHandlers.get(action);
-        if (typeof handler !== 'function') { return; }
-
-        handler(this, params);
+        const data = e.data;
+        if (typeof data !== 'object' || data === null) { return; } // Invalid data
+
+        const token = data.token;
+        if (typeof token !== 'string') { return; } // Invalid data
+
+        if (this._messageToken === null) {
+            // Async
+            this.getMessageToken()
+                .then(
+                    () => { this.handleAction(token, data); },
+                    () => {}
+                );
+        } else {
+            // Sync
+            this.handleAction(token, data);
+        }
     }
 
     onKeyDown(e) {
@@ -94,6 +108,30 @@ class DisplayFloat extends Display {
         return super.onKeyDown(e);
     }
 
+    async getMessageToken() {
+        // this._messageTokenPromise is used to ensure that only one call to apiGetMessageToken is made.
+        if (this._messageTokenPromise === null) {
+            this._messageTokenPromise = apiGetMessageToken();
+        }
+        const messageToken = await this._messageTokenPromise;
+        if (this._messageToken === null) {
+            this._messageToken = messageToken;
+        }
+        this._messageTokenPromise = null;
+    }
+
+    handleAction(token, {action, params}) {
+        if (token !== this._messageToken) {
+            // Invalid token
+            return;
+        }
+
+        const handler = DisplayFloat._messageHandlers.get(action);
+        if (typeof handler !== 'function') { return; }
+
+        handler(this, params);
+    }
+
     getOptionsContext() {
         return this.optionsContext;
     }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 900e7325..4927f4bd 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global apiInjectStylesheet*/
+/*global apiInjectStylesheet, apiGetMessageToken*/
 
 class Popup {
     constructor(id, depth, frameIdPromise) {
@@ -34,6 +34,7 @@ class Popup {
         this._contentScale = 1.0;
         this._containerSizeContentScale = null;
         this._targetOrigin = chrome.runtime.getURL('/').replace(/\/$/, '');
+        this._messageToken = null;
 
         this._container = document.createElement('iframe');
         this._container.className = 'yomichan-float';
@@ -198,6 +199,10 @@ class Popup {
             // NOP
         }
 
+        if (this._messageToken === null) {
+            this._messageToken = await apiGetMessageToken();
+        }
+
         return new Promise((resolve) => {
             const parentFrameId = (typeof this._frameId === 'number' ? this._frameId : null);
             this._container.setAttribute('src', chrome.runtime.getURL('/fg/float.html'));
@@ -349,9 +354,11 @@ class Popup {
     }
 
     _invokeApi(action, params={}) {
-        if (this._container.contentWindow) {
-            this._container.contentWindow.postMessage({action, params}, this._targetOrigin);
-        }
+        const token = this._messageToken;
+        const contentWindow = this._container.contentWindow;
+        if (token === null || contentWindow === null) { return; }
+
+        contentWindow.postMessage({action, params, token}, this._targetOrigin);
     }
 
     static _getFullscreenElement() {
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 14900ecf..7ea68d59 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -113,6 +113,10 @@ function apiGetZoom() {
     return _apiInvoke('getZoom');
 }
 
+function apiGetMessageToken() {
+    return _apiInvoke('getMessageToken');
+}
+
 function _apiInvoke(action, params={}) {
     const data = {action, params};
     return new Promise((resolve, reject) => {
-- 
cgit v1.2.3


From 174d9e7429a0f7a45538e56a594ce627239d80c3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 14:20:22 -0500
Subject: Add some basic unit tests for JSON schemas

---
 .github/workflows/ci.yml |   8 +-
 package.json             |   5 +-
 test/test-schema.js      | 236 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 245 insertions(+), 4 deletions(-)
 create mode 100644 test/test-schema.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40bc005d..c65d254b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,11 @@ jobs:
       run: npm ci
     - name: Build
       run: npm run build --if-present
-    - name: Run tests
-      run: npm test
+    - name: Lint
+      run: npm run test-lint
+      env:
+        CI: true
+    - name: Tests
+      run: npm run test-code
       env:
         CI: true
diff --git a/package.json b/package.json
index 8e71de59..b486c25d 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,9 @@
         "test": "test"
     },
     "scripts": {
-        "test": "npm run test-lint",
-        "test-lint": "eslint ."
+        "test": "npm run test-lint && npm run test-code",
+        "test-lint": "eslint .",
+        "test-code": "node ./test/test-schema.js"
     },
     "repository": {
         "type": "git",
diff --git a/test/test-schema.js b/test/test-schema.js
new file mode 100644
index 00000000..2f294e43
--- /dev/null
+++ b/test/test-schema.js
@@ -0,0 +1,236 @@
+const fs = require('fs');
+const path = require('path');
+const assert = require('assert');
+
+const jsonSchemaFileName = path.join(__dirname, '../ext/bg/js/json-schema.js');
+const jsonSchemaFileSource = fs.readFileSync(jsonSchemaFileName, {encoding: 'utf8'});
+const JsonSchema = Function(`'use strict';${jsonSchemaFileSource};return JsonSchema;`)();
+
+
+function testValidate1() {
+    const schema = {
+        allOf: [
+            {
+                type: 'number'
+            },
+            {
+                anyOf: [
+                    {minimum: 10, maximum: 100},
+                    {minimum: -100, maximum: -10}
+                ]
+            },
+            {
+                oneOf: [
+                    {multipleOf: 3},
+                    {multipleOf: 5}
+                ]
+            },
+            {
+                not: [
+                    {multipleOf: 20}
+                ]
+            }
+        ]
+    };
+
+    const schemaValidate = (value, schema) => {
+        try {
+            JsonSchema.validate(value, schema);
+            return true;
+        } catch (e) {
+            return false;
+        }
+    };
+
+    const jsValidate = (value) => {
+        return (
+            typeof value === 'number' &&
+            (
+                (value >= 10 && value <= 100) ||
+                (value >= -100 && value <= -10)
+            ) &&
+            (
+                (
+                    (value % 3 )=== 0 ||
+                    (value % 5) === 0
+                ) &&
+                (value % 15) !== 0
+            ) &&
+            (value % 20) !== 0
+        );
+    };
+
+    for (let i = -111; i <= 111; i++) {
+        const actual = schemaValidate(i, schema);
+        const expected = jsValidate(i);
+        assert.strictEqual(actual, expected);
+    }
+}
+
+
+function testGetValidValueOrDefault1() {
+    // Test value defaulting on objects with additionalProperties=false
+    const schema = {
+        type: 'object',
+        required: ['test'],
+        properties: {
+            test: {
+                type: 'string',
+                default: 'default'
+            }
+        },
+        additionalProperties: false
+    };
+
+    const testData = [
+        [
+            void(0),
+            {test: 'default'}
+        ],
+        [
+            null,
+            {test: 'default'}
+        ],
+        [
+            0,
+            {test: 'default'}
+        ],
+        [
+            '',
+            {test: 'default'}
+        ],
+        [
+            [],
+            {test: 'default'}
+        ],
+        [
+            {},
+            {test: 'default'}
+        ],
+        [
+            {test: 'value'},
+            {test: 'value'}
+        ],
+        [
+            {test2: 'value2'},
+            {test: 'default'}
+        ],
+        [
+            {test: 'value', test2: 'value2'},
+            {test: 'value'}
+        ]
+    ];
+
+    for (const [value, expected] of testData) {
+        const actual = JsonSchema.getValidValueOrDefault(schema, value);
+        assert.deepStrictEqual(actual, expected);
+    }
+}
+
+function testGetValidValueOrDefault2() {
+    // Test value defaulting on objects with additionalProperties=true
+    const schema = {
+        type: 'object',
+        required: ['test'],
+        properties: {
+            test: {
+                type: 'string',
+                default: 'default'
+            }
+        },
+        additionalProperties: true
+    };
+
+    const testData = [
+        [
+            {},
+            {test: 'default'}
+        ],
+        [
+            {test: 'value'},
+            {test: 'value'}
+        ],
+        [
+            {test2: 'value2'},
+            {test: 'default', test2: 'value2'}
+        ],
+        [
+            {test: 'value', test2: 'value2'},
+            {test: 'value', test2: 'value2'}
+        ]
+    ];
+
+    for (const [value, expected] of testData) {
+        const actual = JsonSchema.getValidValueOrDefault(schema, value);
+        assert.deepStrictEqual(actual, expected);
+    }
+}
+
+function testGetValidValueOrDefault3() {
+    // Test value defaulting on objects with additionalProperties={schema}
+    const schema = {
+        type: 'object',
+        required: ['test'],
+        properties: {
+            test: {
+                type: 'string',
+                default: 'default'
+            }
+        },
+        additionalProperties: {
+            type: 'number',
+            default: 10
+        }
+    };
+
+    const testData = [
+        [
+            {},
+            {test: 'default'}
+        ],
+        [
+            {test: 'value'},
+            {test: 'value'}
+        ],
+        [
+            {test2: 'value2'},
+            {test: 'default', test2: 10}
+        ],
+        [
+            {test: 'value', test2: 'value2'},
+            {test: 'value', test2: 10}
+        ],
+        [
+            {test2: 2},
+            {test: 'default', test2: 2}
+        ],
+        [
+            {test: 'value', test2: 2},
+            {test: 'value', test2: 2}
+        ],
+        [
+            {test: 'value', test2: 2, test3: null},
+            {test: 'value', test2: 2, test3: 10}
+        ],
+        [
+            {test: 'value', test2: 2, test3: void(0)},
+            {test: 'value', test2: 2, test3: 10}
+        ]
+    ];
+
+    for (const [value, expected] of testData) {
+        const actual = JsonSchema.getValidValueOrDefault(schema, value);
+        assert.deepStrictEqual(actual, expected);
+    }
+}
+
+
+function main() {
+    testValidate1();
+    testGetValidValueOrDefault1();
+    testGetValidValueOrDefault2();
+    testGetValidValueOrDefault3();
+}
+
+
+main();
-- 
cgit v1.2.3


From 7cbebf6897efb32c80c5e258f594d18861974bad Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 22:30:16 -0500
Subject: Update how main is invoked

---
 test/dictionary-validate.js | 2 +-
 test/schema-validate.js     | 2 +-
 test/test-schema.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index 971c4971..dca3bcf5 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -87,4 +87,4 @@ async function main() {
 }
 
 
-main();
+if (require.main === module) { main(); }
diff --git a/test/schema-validate.js b/test/schema-validate.js
index ac5a8a85..309adf83 100644
--- a/test/schema-validate.js
+++ b/test/schema-validate.js
@@ -33,4 +33,4 @@ function main() {
 }
 
 
-main();
+if (require.main === module) { main(); }
diff --git a/test/test-schema.js b/test/test-schema.js
index 2f294e43..762b8509 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -233,4 +233,4 @@ function main() {
 }
 
 
-main();
+if (require.main === module) { main(); }
-- 
cgit v1.2.3


From 06480751a9d9ff1471455f31e3efc99d552a4975 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 22:31:28 -0500
Subject: Create yomichan-test script to reduce repeated code

---
 test/dictionary-validate.js | 10 +++-------
 test/schema-validate.js     |  6 ++----
 test/test-schema.js         |  7 ++-----
 test/yomichan-test.js       | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 test/yomichan-test.js

diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index dca3bcf5..082f0aea 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -1,13 +1,9 @@
 const fs = require('fs');
 const path = require('path');
+const yomichanTest = require('./yomichan-test');
 
-process.noDeprecation = true; // Suppress a warning about JSZip
-const JSZip = require(path.join(__dirname, '../ext/mixed/lib/jszip.min.js'));
-process.noDeprecation = false;
-
-const jsonSchemaFileName = path.join(__dirname, '../ext/bg/js/json-schema.js');
-const jsonSchemaFileSource = fs.readFileSync(jsonSchemaFileName, {encoding: 'utf8'});
-const JsonSchema = Function(`'use strict';${jsonSchemaFileSource};return JsonSchema;`)();
+const JSZip = yomichanTest.JSZip;
+const {JsonSchema} = yomichanTest.requireScript('ext/bg/js/json-schema.js', ['JsonSchema']);
 
 
 function readSchema(relativeFileName) {
diff --git a/test/schema-validate.js b/test/schema-validate.js
index 309adf83..1271a611 100644
--- a/test/schema-validate.js
+++ b/test/schema-validate.js
@@ -1,9 +1,7 @@
 const fs = require('fs');
-const path = require('path');
+const yomichanTest = require('./yomichan-test');
 
-const jsonSchemaFileName = path.join(__dirname, '../ext/bg/js/json-schema.js');
-const jsonSchemaFileSource = fs.readFileSync(jsonSchemaFileName, {encoding: 'utf8'});
-const JsonSchema = Function(`'use strict';${jsonSchemaFileSource};return JsonSchema;`)();
+const {JsonSchema} = yomichanTest.requireScript('ext/bg/js/json-schema.js', ['JsonSchema']);
 
 
 function main() {
diff --git a/test/test-schema.js b/test/test-schema.js
index 762b8509..ca4f56dd 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -1,10 +1,7 @@
-const fs = require('fs');
-const path = require('path');
 const assert = require('assert');
+const yomichanTest = require('./yomichan-test');
 
-const jsonSchemaFileName = path.join(__dirname, '../ext/bg/js/json-schema.js');
-const jsonSchemaFileSource = fs.readFileSync(jsonSchemaFileName, {encoding: 'utf8'});
-const JsonSchema = Function(`'use strict';${jsonSchemaFileSource};return JsonSchema;`)();
+const {JsonSchema} = yomichanTest.requireScript('ext/bg/js/json-schema.js', ['JsonSchema']);
 
 
 function testValidate1() {
diff --git a/test/yomichan-test.js b/test/yomichan-test.js
new file mode 100644
index 00000000..602b8d78
--- /dev/null
+++ b/test/yomichan-test.js
@@ -0,0 +1,33 @@
+const fs = require('fs');
+const path = require('path');
+
+
+let JSZip = null;
+
+function requireScript(fileName, exportNames, variables) {
+    const absoluteFileName = path.join(__dirname, '..', fileName);
+    const source = fs.readFileSync(absoluteFileName, {encoding: 'utf8'});
+    const exportNamesString = Array.isArray(exportNames) ? exportNames.join(',') : '';
+    const variablesArgumentName = '__variables__';
+    let variableString = '';
+    if (typeof variables === 'object' && variables !== null) {
+        variableString = Object.keys(variables).join(',');
+        variableString = `const {${variableString}} = ${variablesArgumentName};`;
+    }
+    return Function(variablesArgumentName, `'use strict';${variableString}${source}\n;return {${exportNamesString}};`)(variables);
+}
+
+function getJSZip() {
+    if (JSZip === null) {
+        process.noDeprecation = true; // Suppress a warning about JSZip
+        JSZip = require(path.join(__dirname, '../ext/mixed/lib/jszip.min.js'));
+        process.noDeprecation = false;
+    }
+    return JSZip;
+}
+
+
+module.exports = {
+    requireScript,
+    get JSZip() { return getJSZip(); }
+};
-- 
cgit v1.2.3


From dce5f7e1e532240a2ce3ab8cb8a2ee846572c0b9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 22:38:48 -0500
Subject: Allow dictionary-validate to be require'd

---
 test/dictionary-validate.js | 51 ++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index 082f0aea..ccbd4ae4 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -28,11 +28,8 @@ async function validateDictionaryBanks(zip, fileNameFormat, schema) {
     }
 }
 
-async function validateDictionary(fileName, schemas) {
-    const source = fs.readFileSync(fileName);
-    const zip = await JSZip.loadAsync(source);
-
-    const indexFile = zip.files['index.json'];
+async function validateDictionary(archive, schemas) {
+    const indexFile = archive.files['index.json'];
     if (!indexFile) {
         throw new Error('No dictionary index found in archive');
     }
@@ -42,11 +39,24 @@ async function validateDictionary(fileName, schemas) {
 
     JsonSchema.validate(index, schemas.index);
 
-    await validateDictionaryBanks(zip, 'term_bank_%s.json', version === 1 ? schemas.termBankV1 : schemas.termBankV3);
-    await validateDictionaryBanks(zip, 'term_meta_bank_%s.json', schemas.termMetaBankV3);
-    await validateDictionaryBanks(zip, 'kanji_bank_%s.json', version === 1 ? schemas.kanjiBankV1 : schemas.kanjiBankV3);
-    await validateDictionaryBanks(zip, 'kanji_meta_bank_%s.json', schemas.kanjiMetaBankV3);
-    await validateDictionaryBanks(zip, 'tag_bank_%s.json', schemas.tagBankV3);
+    await validateDictionaryBanks(archive, 'term_bank_%s.json', version === 1 ? schemas.termBankV1 : schemas.termBankV3);
+    await validateDictionaryBanks(archive, 'term_meta_bank_%s.json', schemas.termMetaBankV3);
+    await validateDictionaryBanks(archive, 'kanji_bank_%s.json', version === 1 ? schemas.kanjiBankV1 : schemas.kanjiBankV3);
+    await validateDictionaryBanks(archive, 'kanji_meta_bank_%s.json', schemas.kanjiMetaBankV3);
+    await validateDictionaryBanks(archive, 'tag_bank_%s.json', schemas.tagBankV3);
+}
+
+function getSchemas() {
+    return {
+        index: readSchema('../ext/bg/data/dictionary-index-schema.json'),
+        kanjiBankV1: readSchema('../ext/bg/data/dictionary-kanji-bank-v1-schema.json'),
+        kanjiBankV3: readSchema('../ext/bg/data/dictionary-kanji-bank-v3-schema.json'),
+        kanjiMetaBankV3: readSchema('../ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json'),
+        tagBankV3: readSchema('../ext/bg/data/dictionary-tag-bank-v3-schema.json'),
+        termBankV1: readSchema('../ext/bg/data/dictionary-term-bank-v1-schema.json'),
+        termBankV3: readSchema('../ext/bg/data/dictionary-term-bank-v3-schema.json'),
+        termMetaBankV3: readSchema('../ext/bg/data/dictionary-term-meta-bank-v3-schema.json')
+    };
 }
 
 
@@ -60,21 +70,14 @@ async function main() {
         return;
     }
 
-    const schemas = {
-        index: readSchema('../ext/bg/data/dictionary-index-schema.json'),
-        kanjiBankV1: readSchema('../ext/bg/data/dictionary-kanji-bank-v1-schema.json'),
-        kanjiBankV3: readSchema('../ext/bg/data/dictionary-kanji-bank-v3-schema.json'),
-        kanjiMetaBankV3: readSchema('../ext/bg/data/dictionary-kanji-meta-bank-v3-schema.json'),
-        tagBankV3: readSchema('../ext/bg/data/dictionary-tag-bank-v3-schema.json'),
-        termBankV1: readSchema('../ext/bg/data/dictionary-term-bank-v1-schema.json'),
-        termBankV3: readSchema('../ext/bg/data/dictionary-term-bank-v3-schema.json'),
-        termMetaBankV3: readSchema('../ext/bg/data/dictionary-term-meta-bank-v3-schema.json')
-    };
+    const schemas = getSchemas();
 
     for (const dictionaryFileName of dictionaryFileNames) {
         try {
             console.log(`Validating ${dictionaryFileName}...`);
-            await validateDictionary(dictionaryFileName, schemas);
+            const source = fs.readFileSync(dictionaryFileName);
+            const archive = await JSZip.loadAsync(source);
+            await validateDictionary(archive, schemas);
             console.log('No issues found');
         } catch (e) {
             console.warn(e);
@@ -84,3 +87,9 @@ async function main() {
 
 
 if (require.main === module) { main(); }
+
+
+module.exports = {
+    getSchemas,
+    validateDictionary
+};
-- 
cgit v1.2.3


From f2f4081d4572c48ebbe6685b8f89889823da0a69 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 22:39:25 -0500
Subject: Use ? instead of %s

---
 test/dictionary-validate.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index ccbd4ae4..25a5de88 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -16,7 +16,7 @@ function readSchema(relativeFileName) {
 async function validateDictionaryBanks(zip, fileNameFormat, schema) {
     let index = 1;
     while (true) {
-        const fileName = fileNameFormat.replace(/%s/, index);
+        const fileName = fileNameFormat.replace(/\?/, index);
 
         const file = zip.files[fileName];
         if (!file) { break; }
@@ -39,11 +39,11 @@ async function validateDictionary(archive, schemas) {
 
     JsonSchema.validate(index, schemas.index);
 
-    await validateDictionaryBanks(archive, 'term_bank_%s.json', version === 1 ? schemas.termBankV1 : schemas.termBankV3);
-    await validateDictionaryBanks(archive, 'term_meta_bank_%s.json', schemas.termMetaBankV3);
-    await validateDictionaryBanks(archive, 'kanji_bank_%s.json', version === 1 ? schemas.kanjiBankV1 : schemas.kanjiBankV3);
-    await validateDictionaryBanks(archive, 'kanji_meta_bank_%s.json', schemas.kanjiMetaBankV3);
-    await validateDictionaryBanks(archive, 'tag_bank_%s.json', schemas.tagBankV3);
+    await validateDictionaryBanks(archive, 'term_bank_?.json', version === 1 ? schemas.termBankV1 : schemas.termBankV3);
+    await validateDictionaryBanks(archive, 'term_meta_bank_?.json', schemas.termMetaBankV3);
+    await validateDictionaryBanks(archive, 'kanji_bank_?.json', version === 1 ? schemas.kanjiBankV1 : schemas.kanjiBankV3);
+    await validateDictionaryBanks(archive, 'kanji_meta_bank_?.json', schemas.kanjiMetaBankV3);
+    await validateDictionaryBanks(archive, 'tag_bank_?.json', schemas.tagBankV3);
 }
 
 function getSchemas() {
-- 
cgit v1.2.3


From 03886eb83310d051cc2a8d2ab0bb69412239ddd8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:16:30 -0500
Subject: Add fake-indexeddb

---
 package-lock.json | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  3 +-
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 11cf28bc..505c71db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -93,6 +93,12 @@
             "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
             "dev": true
         },
+        "base64-arraybuffer-es6": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.5.0.tgz",
+            "integrity": "sha512-UCIPaDJrNNj5jG2ZL+nzJ7czvZV/ZYX6LaIRgfVU1k1edJOQg7dkbiSKzwHkNp6aHEHER/PhlFBrMYnlvJJQEw==",
+            "dev": true
+        },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -162,6 +168,12 @@
             "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
             "dev": true
         },
+        "core-js": {
+            "version": "2.6.11",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+            "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
+            "dev": true
+        },
         "cross-spawn": {
             "version": "6.0.5",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -207,6 +219,15 @@
                 "esutils": "^2.0.2"
             }
         },
+        "domexception": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+            "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+            "dev": true,
+            "requires": {
+                "webidl-conversions": "^4.0.2"
+            }
+        },
         "emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -353,6 +374,16 @@
                 "tmp": "^0.0.33"
             }
         },
+        "fake-indexeddb": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-3.0.0.tgz",
+            "integrity": "sha512-VrnV9dJWlVWvd8hp9MMR+JS4RLC4ZmToSkuCg91ZwpYE5mSODb3n5VEaV62Hf3AusnbrPfwQhukU+rGZm5W8PQ==",
+            "dev": true,
+            "requires": {
+                "realistic-structured-clone": "^2.0.1",
+                "setimmediate": "^1.0.5"
+            }
+        },
         "fast-deep-equal": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
@@ -601,6 +632,12 @@
             "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
             "dev": true
         },
+        "lodash.sortby": {
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+            "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+            "dev": true
+        },
         "mimic-fn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -732,6 +769,18 @@
             "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
             "dev": true
         },
+        "realistic-structured-clone": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/realistic-structured-clone/-/realistic-structured-clone-2.0.2.tgz",
+            "integrity": "sha512-5IEvyfuMJ4tjQOuKKTFNvd+H9GSbE87IcendSBannE28PTrbolgaVg5DdEApRKhtze794iXqVUFKV60GLCNKEg==",
+            "dev": true,
+            "requires": {
+                "core-js": "^2.5.3",
+                "domexception": "^1.0.1",
+                "typeson": "^5.8.2",
+                "typeson-registry": "^1.0.0-alpha.20"
+            }
+        },
         "regexpp": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
@@ -793,6 +842,12 @@
             "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
             "dev": true
         },
+        "setimmediate": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+            "dev": true
+        },
         "shebang-command": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -951,6 +1006,15 @@
                 "os-tmpdir": "~1.0.2"
             }
         },
+        "tr46": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+            "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+            "dev": true,
+            "requires": {
+                "punycode": "^2.1.0"
+            }
+        },
         "tslib": {
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
@@ -972,6 +1036,23 @@
             "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
             "dev": true
         },
+        "typeson": {
+            "version": "5.18.2",
+            "resolved": "https://registry.npmjs.org/typeson/-/typeson-5.18.2.tgz",
+            "integrity": "sha512-Vetd+OGX05P4qHyHiSLdHZ5Z5GuQDrHHwSdjkqho9NSCYVSLSfRMjklD/unpHH8tXBR9Z/R05rwJSuMpMFrdsw==",
+            "dev": true
+        },
+        "typeson-registry": {
+            "version": "1.0.0-alpha.34",
+            "resolved": "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.34.tgz",
+            "integrity": "sha512-2U0R5eFGJPaqha8HBAICJv6rW2x/cAVHizURHbcAo61Mpd47s+MDn67Ktxoyl9jWgsqCAibZsrldG8v/2ZuCaw==",
+            "dev": true,
+            "requires": {
+                "base64-arraybuffer-es6": "0.5.0",
+                "typeson": "5.18.2",
+                "whatwg-url": "7.1.0"
+            }
+        },
         "uri-js": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -987,6 +1068,23 @@
             "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
             "dev": true
         },
+        "webidl-conversions": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+            "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+            "dev": true
+        },
+        "whatwg-url": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+            "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+            "dev": true,
+            "requires": {
+                "lodash.sortby": "^4.7.0",
+                "tr46": "^1.0.1",
+                "webidl-conversions": "^4.0.2"
+            }
+        },
         "which": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
diff --git a/package.json b/package.json
index b486c25d..4190741a 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "homepage": "https://foosoft.net/projects/yomichan/",
     "devDependencies": {
         "eslint": "^6.8.0",
-        "eslint-plugin-no-unsanitized": "^3.0.2"
+        "eslint-plugin-no-unsanitized": "^3.0.2",
+        "fake-indexeddb": "^3.0.0"
     }
 }
-- 
cgit v1.2.3


From 09ea007883360589d8b5aeb72ddb75eb126ce595 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:19:08 -0500
Subject: Add test dictionary data

---
 test/test-dictionary-data/index.json             |  6 ++++
 test/test-dictionary-data/kanji_bank_1.json      | 42 ++++++++++++++++++++++++
 test/test-dictionary-data/kanji_meta_bank_1.json |  4 +++
 test/test-dictionary-data/tag_bank_1.json        |  7 ++++
 test/test-dictionary-data/tag_bank_2.json        |  9 +++++
 test/test-dictionary-data/term_bank_1.json       | 34 +++++++++++++++++++
 test/test-dictionary-data/term_meta_bank_1.json  |  5 +++
 test/yomichan-test.js                            | 26 +++++++++++++++
 8 files changed, 133 insertions(+)
 create mode 100644 test/test-dictionary-data/index.json
 create mode 100644 test/test-dictionary-data/kanji_bank_1.json
 create mode 100644 test/test-dictionary-data/kanji_meta_bank_1.json
 create mode 100644 test/test-dictionary-data/tag_bank_1.json
 create mode 100644 test/test-dictionary-data/tag_bank_2.json
 create mode 100644 test/test-dictionary-data/term_bank_1.json
 create mode 100644 test/test-dictionary-data/term_meta_bank_1.json

diff --git a/test/test-dictionary-data/index.json b/test/test-dictionary-data/index.json
new file mode 100644
index 00000000..3034bf38
--- /dev/null
+++ b/test/test-dictionary-data/index.json
@@ -0,0 +1,6 @@
+{
+    "title": "Test Dictionary",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true
+}
\ No newline at end of file
diff --git a/test/test-dictionary-data/kanji_bank_1.json b/test/test-dictionary-data/kanji_bank_1.json
new file mode 100644
index 00000000..264f94c1
--- /dev/null
+++ b/test/test-dictionary-data/kanji_bank_1.json
@@ -0,0 +1,42 @@
+[
+    [
+        "打",
+        "ダ ダアス",
+        "う.つ う.ち- ぶ.つ",
+        "ktag1 ktag2",
+        [
+            "meaning1",
+            "meaning2",
+            "meaning3",
+            "meaning4",
+            "meaning5"
+        ],
+        {
+            "kstat1": "1",
+            "kstat2": "2",
+            "kstat3": "3",
+            "kstat4": "4",
+            "kstat5": "5"
+        }
+    ],
+    [
+        "込",
+        "",
+        "-こ.む こ.む こ.み -こ.み こ.める",
+        "ktag1 ktag2",
+        [
+            "meaning1",
+            "meaning2",
+            "meaning3",
+            "meaning4",
+            "meaning5"
+        ],
+        {
+            "kstat1": "1",
+            "kstat2": "2",
+            "kstat3": "3",
+            "kstat4": "4",
+            "kstat5": "5"
+        }
+    ]
+]
\ No newline at end of file
diff --git a/test/test-dictionary-data/kanji_meta_bank_1.json b/test/test-dictionary-data/kanji_meta_bank_1.json
new file mode 100644
index 00000000..73e75b8a
--- /dev/null
+++ b/test/test-dictionary-data/kanji_meta_bank_1.json
@@ -0,0 +1,4 @@
+[
+    ["打", "freq", 1],
+    ["込", "freq", 2]
+]
\ No newline at end of file
diff --git a/test/test-dictionary-data/tag_bank_1.json b/test/test-dictionary-data/tag_bank_1.json
new file mode 100644
index 00000000..109ad395
--- /dev/null
+++ b/test/test-dictionary-data/tag_bank_1.json
@@ -0,0 +1,7 @@
+[
+    ["tag1", "category1", 0, "tag1 notes", 0],
+    ["tag2", "category2", 0, "tag2 notes", 0],
+    ["tag3", "category3", 0, "tag3 notes", 0],
+    ["tag4", "category4", 0, "tag4 notes", 0],
+    ["tag5", "category5", 0, "tag5 notes", 0]
+]
\ No newline at end of file
diff --git a/test/test-dictionary-data/tag_bank_2.json b/test/test-dictionary-data/tag_bank_2.json
new file mode 100644
index 00000000..5e7936b3
--- /dev/null
+++ b/test/test-dictionary-data/tag_bank_2.json
@@ -0,0 +1,9 @@
+[
+    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
+    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
+    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
+    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
+    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
+    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
+    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
+]
\ No newline at end of file
diff --git a/test/test-dictionary-data/term_bank_1.json b/test/test-dictionary-data/term_bank_1.json
new file mode 100644
index 00000000..755d9f6a
--- /dev/null
+++ b/test/test-dictionary-data/term_bank_1.json
@@ -0,0 +1,34 @@
+[
+    ["打", "だ", "tag1 tag2", "", 2, ["definition1a (打, だ)", "definition1b (打, だ)"], 1, "tag3 tag4 tag5"],
+    ["打", "ダース", "tag1 tag2", "", 1, ["definition1a (打, ダース)", "definition1b (打, ダース)"], 2, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 3, ["definition1a (打つ, うつ)", "definition1b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 4, ["definition2a (打つ, うつ)", "definition2b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 5, ["definition3a (打つ, うつ)", "definition3b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 6, ["definition4a (打つ, うつ)", "definition4b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 7, ["definition5a (打つ, うつ)", "definition5b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 8, ["definition6a (打つ, うつ)", "definition6b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 9, ["definition7a (打つ, うつ)", "definition7b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition8a (打つ, うつ)", "definition8b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 11, ["definition9a (打つ, うつ)", "definition9b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 12, ["definition10a (打つ, うつ)", "definition10b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 13, ["definition11a (打つ, うつ)", "definition11b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 14, ["definition12a (打つ, うつ)", "definition12b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 15, ["definition13a (打つ, うつ)", "definition13b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 16, ["definition14a (打つ, うつ)", "definition14b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 17, ["definition15a (打つ, うつ)", "definition15b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "ぶつ", "tag1 tag2", "v5", 18, ["definition1a (打つ, ぶつ)", "definition1b (打つ, ぶつ)"], 4, "tag3 tag4 tag5"],
+    ["打つ", "ぶつ", "tag1 tag2", "v5", 19, ["definition2a (打つ, ぶつ)", "definition2b (打つ, ぶつ)"], 4, "tag3 tag4 tag5"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 20, ["definition1a (打ち込む, うちこむ)", "definition1b (打ち込む, うちこむ)"], 5, "tag3 tag4 tag5"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 21, ["definition2a (打ち込む, うちこむ)", "definition2b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 22, ["definition3a (打ち込む, うちこむ)", "definition3b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 23, ["definition4a (打ち込む, うちこむ)", "definition4b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 24, ["definition5a (打ち込む, うちこむ)", "definition5b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 25, ["definition6a (打ち込む, うちこむ)", "definition6b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 26, ["definition7a (打ち込む, うちこむ)", "definition7b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 27, ["definition8a (打ち込む, うちこむ)", "definition8b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 28, ["definition9a (打ち込む, うちこむ)", "definition9b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 29, ["definition1a (打ち込む, ぶちこむ)", "definition1b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 30, ["definition2a (打ち込む, ぶちこむ)", "definition2b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 31, ["definition3a (打ち込む, ぶちこむ)", "definition3b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 32, ["definition4a (打ち込む, ぶちこむ)", "definition4b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"]
+]
\ No newline at end of file
diff --git a/test/test-dictionary-data/term_meta_bank_1.json b/test/test-dictionary-data/term_meta_bank_1.json
new file mode 100644
index 00000000..78096502
--- /dev/null
+++ b/test/test-dictionary-data/term_meta_bank_1.json
@@ -0,0 +1,5 @@
+[
+    ["打", "freq", 1],
+    ["打つ", "freq", 2],
+    ["打ち込む", "freq", 3]
+]
\ No newline at end of file
diff --git a/test/yomichan-test.js b/test/yomichan-test.js
index 602b8d78..dd4da919 100644
--- a/test/yomichan-test.js
+++ b/test/yomichan-test.js
@@ -26,8 +26,34 @@ function getJSZip() {
     return JSZip;
 }
 
+function createTestDictionaryArchive(dictionaryName) {
+    const fileNames = [
+        'index.json',
+        'tag_bank_1.json',
+        'tag_bank_2.json',
+        'term_bank_1.json',
+        'kanji_bank_1.json',
+        'term_meta_bank_1.json',
+        'kanji_meta_bank_1.json'
+    ];
+
+    const archive = new (getJSZip())();
+
+    for (const fileName of fileNames) {
+        const source = fs.readFileSync(path.join(__dirname, 'test-dictionary-data', fileName), {encoding: 'utf8'});
+        const json = JSON.parse(source);
+        if (fileName === 'index.json' && typeof dictionaryName === 'string') {
+            json.title = dictionaryName;
+        }
+        archive.file(fileName, JSON.stringify(json, null, 0));
+    }
+
+    return archive;
+}
+
 
 module.exports = {
     requireScript,
+    createTestDictionaryArchive,
     get JSZip() { return getJSZip(); }
 };
-- 
cgit v1.2.3


From da079820e63f05b54ac867022f11bcbdcd6acc20 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:19:33 -0500
Subject: Add script to validate the test dictionary data against JSON schemas

---
 test/test-dictionary.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 test/test-dictionary.js

diff --git a/test/test-dictionary.js b/test/test-dictionary.js
new file mode 100644
index 00000000..84014540
--- /dev/null
+++ b/test/test-dictionary.js
@@ -0,0 +1,12 @@
+const yomichanTest = require('./yomichan-test');
+const dictionaryValidate = require('./dictionary-validate');
+
+
+async function main() {
+    const archive = yomichanTest.createTestDictionaryArchive();
+    const schemas = dictionaryValidate.getSchemas();
+    await dictionaryValidate.validateDictionary(archive, schemas);
+}
+
+
+if (require.main === module) { main(); }
-- 
cgit v1.2.3


From 2829c88e7de0e966587934c49dd1ff1583445792 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:19:55 -0500
Subject: Add script to test database.js

---
 test/test-database.js | 720 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 720 insertions(+)
 create mode 100644 test/test-database.js

diff --git a/test/test-database.js b/test/test-database.js
new file mode 100644
index 00000000..b9ac8a46
--- /dev/null
+++ b/test/test-database.js
@@ -0,0 +1,720 @@
+const assert = require('assert');
+const yomichanTest = require('./yomichan-test');
+require('fake-indexeddb/auto');
+
+const chrome = {
+    runtime: {
+        onMessage: {
+            addListener: () => { /* NOP */ }
+        }
+    }
+};
+
+const {Database} = yomichanTest.requireScript('ext/bg/js/database.js', ['Database']);
+const {dictFieldSplit, dictTagSanitize} = yomichanTest.requireScript('ext/bg/js/dictionary.js', ['dictFieldSplit', 'dictTagSanitize']);
+const {stringReverse, hasOwn} = yomichanTest.requireScript('ext/mixed/js/core.js', ['stringReverse', 'hasOwn'], {chrome});
+
+global.window = global;
+global.JSZip = yomichanTest.JSZip;
+global.dictFieldSplit = dictFieldSplit;
+global.dictTagSanitize = dictTagSanitize;
+global.stringReverse = stringReverse;
+global.hasOwn = hasOwn;
+
+
+function countTermsWithExpression(terms, expression) {
+    return terms.reduce((i, v) => (i + (v.expression === expression ? 1 : 0)), 0);
+}
+
+function countTermsWithReading(terms, reading) {
+    return terms.reduce((i, v) => (i + (v.reading === reading ? 1 : 0)), 0);
+}
+
+function countMetasWithMode(metas, mode) {
+    return metas.reduce((i, v) => (i + (v.mode === mode ? 1 : 0)), 0);
+}
+
+function countKanjiWithCharacter(kanji, character) {
+    return kanji.reduce((i, v) => (i + (v.character === character ? 1 : 0)), 0);
+}
+
+
+async function testDatabase1() {
+    // Load dictionary data
+    const testDictionary = yomichanTest.createTestDictionaryArchive();
+    const testDictionarySource = await testDictionary.generateAsync({type: 'string'});
+    const testDictionaryIndex = JSON.parse(await testDictionary.files['index.json'].async('string'));
+
+    const title = testDictionaryIndex.title;
+    const titles = [title];
+
+    // Setup iteration data
+    const iterations = [
+        {
+            cleanup: async () => {
+                // Test purge
+                await database.purge();
+                await testDatabaseEmpty1(database);
+            }
+        },
+        {
+            cleanup: async () => {
+                // Test deleteDictionary
+                let progressEvent = false;
+                await database.deleteDictionary(
+                    title,
+                    () => {
+                        progressEvent = true;
+                    },
+                    {rate: 1000}
+                );
+                assert.ok(progressEvent);
+
+                await testDatabaseEmpty1(database);
+            }
+        },
+        {
+            cleanup: async () => {}
+        }
+    ];
+
+    // Setup database
+    const database = new Database();
+    await database.prepare();
+
+    for (const {cleanup} of iterations) {
+        // Import data
+        let progressEvent = false;
+        await database.importDictionary(
+            testDictionarySource,
+            () => {
+                progressEvent = true;
+            },
+            {prefixWildcardsSupported: true}
+        );
+        assert.ok(progressEvent);
+
+        // Get info summary
+        const info = await database.getDictionaryInfo();
+        assert.deepStrictEqual(info, [{
+            title,
+            revision: 'test',
+            sequenced: true,
+            version: 3,
+            prefixWildcardsSupported: true
+        }]);
+
+        // Get counts
+        const counts = await database.getDictionaryCounts(
+            info.map((v) => v.title),
+            true
+        );
+        assert.deepStrictEqual(counts, {
+            counts: [{kanji: 2, kanjiMeta: 2, terms: 32, termMeta: 3, tagMeta: 12}],
+            total: {kanji: 2, kanjiMeta: 2, terms: 32, termMeta: 3, tagMeta: 12}
+        });
+
+        // Test find* functions
+        await testFindTermsBulkTest1(database, titles);
+        await testTindTermsExactBulk1(database, titles);
+        await testFindTermsBySequenceBulk1(database, title);
+        await testFindTermMetaBulk1(database, titles);
+        await testFindKanjiBulk1(database, titles);
+        await testFindKanjiMetaBulk1(database, titles);
+        await testFindTagForTitle1(database, title);
+
+        // Cleanup
+        await cleanup();
+    }
+}
+
+async function testDatabaseEmpty1(database) {
+    const info = await database.getDictionaryInfo();
+    assert.deepStrictEqual(info, []);
+
+    const counts = await database.getDictionaryCounts([], true);
+    assert.deepStrictEqual(counts, {
+        counts: [],
+        total: {kanji: 0, kanjiMeta: 0, terms: 0, termMeta: 0, tagMeta: 0}
+    });
+}
+
+async function testFindTermsBulkTest1(database, titles) {
+    const data = [
+        {
+            inputs: [
+                {
+                    wildcard: null,
+                    termList: ['打', '打つ', '打ち込む']
+                },
+                {
+                    wildcard: null,
+                    termList: ['だ', 'ダース', 'うつ', 'ぶつ', 'うちこむ', 'ぶちこむ']
+                },
+                {
+                    wildcard: 'suffix',
+                    termList: ['打']
+                }
+            ],
+            expectedResults: {
+                total: 32,
+                expressions: [
+                    ['打', 2],
+                    ['打つ', 17],
+                    ['打ち込む', 13]
+                ],
+                readings: [
+                    ['だ', 1],
+                    ['ダース', 1],
+                    ['うつ', 15],
+                    ['ぶつ', 2],
+                    ['うちこむ', 9],
+                    ['ぶちこむ', 4]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    wildcard: null,
+                    termList: ['込む']
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        },
+        {
+            inputs: [
+                {
+                    wildcard: 'prefix',
+                    termList: ['込む']
+                }
+            ],
+            expectedResults: {
+                total: 13,
+                expressions: [
+                    ['打ち込む', 13]
+                ],
+                readings: [
+                    ['うちこむ', 9],
+                    ['ぶちこむ', 4]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    wildcard: null,
+                    termList: []
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {termList, wildcard} of inputs) {
+            const results = await database.findTermsBulk(termList, titles, wildcard);
+            assert.strictEqual(results.length, expectedResults.total);
+            for (const [expression, count] of expectedResults.expressions) {
+                assert.strictEqual(countTermsWithExpression(results, expression), count);
+            }
+            for (const [reading, count] of expectedResults.readings) {
+                assert.strictEqual(countTermsWithReading(results, reading), count);
+            }
+        }
+    }
+}
+
+async function testTindTermsExactBulk1(database, titles) {
+    const data = [
+        {
+            inputs: [
+                {
+                    termList: ['打', '打つ', '打ち込む'],
+                    readingList: ['だ', 'うつ', 'うちこむ']
+                }
+            ],
+            expectedResults: {
+                total: 25,
+                expressions: [
+                    ['打', 1],
+                    ['打つ', 15],
+                    ['打ち込む', 9]
+                ],
+                readings: [
+                    ['だ', 1],
+                    ['うつ', 15],
+                    ['うちこむ', 9]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: ['打', '打つ', '打ち込む'],
+                    readingList: ['だ?', 'うつ?', 'うちこむ?']
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: ['打つ', '打つ'],
+                    readingList: ['うつ', 'ぶつ']
+                }
+            ],
+            expectedResults: {
+                total: 17,
+                expressions: [
+                    ['打つ', 17]
+                ],
+                readings: [
+                    ['うつ', 15],
+                    ['ぶつ', 2]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: ['打つ'],
+                    readingList: ['うちこむ']
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: [],
+                    readingList: []
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {termList, readingList} of inputs) {
+            const results = await database.findTermsExactBulk(termList, readingList, titles);
+            assert.strictEqual(results.length, expectedResults.total);
+            for (const [expression, count] of expectedResults.expressions) {
+                assert.strictEqual(countTermsWithExpression(results, expression), count);
+            }
+            for (const [reading, count] of expectedResults.readings) {
+                assert.strictEqual(countTermsWithReading(results, reading), count);
+            }
+        }
+    }
+}
+
+async function testFindTermsBySequenceBulk1(database, mainDictionary) {
+    const data = [
+        {
+            inputs: [
+                {
+                    sequenceList: [1, 2, 3, 4, 5, 6]
+                }
+            ],
+            expectedResults: {
+                total: 32,
+                expressions: [
+                    ['打', 2],
+                    ['打つ', 17],
+                    ['打ち込む', 13]
+                ],
+                readings: [
+                    ['だ', 1],
+                    ['ダース', 1],
+                    ['うつ', 15],
+                    ['ぶつ', 2],
+                    ['うちこむ', 9],
+                    ['ぶちこむ', 4]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [1]
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                expressions: [
+                    ['打', 1]
+                ],
+                readings: [
+                    ['だ', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [2]
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                expressions: [
+                    ['打', 1]
+                ],
+                readings: [
+                    ['ダース', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [3]
+                }
+            ],
+            expectedResults: {
+                total: 15,
+                expressions: [
+                    ['打つ', 15]
+                ],
+                readings: [
+                    ['うつ', 15]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [4]
+                }
+            ],
+            expectedResults: {
+                total: 2,
+                expressions: [
+                    ['打つ', 2]
+                ],
+                readings: [
+                    ['ぶつ', 2]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [5]
+                }
+            ],
+            expectedResults: {
+                total: 9,
+                expressions: [
+                    ['打ち込む', 9]
+                ],
+                readings: [
+                    ['うちこむ', 9]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [6]
+                }
+            ],
+            expectedResults: {
+                total: 4,
+                expressions: [
+                    ['打ち込む', 4]
+                ],
+                readings: [
+                    ['ぶちこむ', 4]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: [-1]
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        },
+        {
+            inputs: [
+                {
+                    sequenceList: []
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                expressions: [],
+                readings: []
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {sequenceList} of inputs) {
+            const results = await database.findTermsBySequenceBulk(sequenceList, mainDictionary);
+            assert.strictEqual(results.length, expectedResults.total);
+            for (const [expression, count] of expectedResults.expressions) {
+                assert.strictEqual(countTermsWithExpression(results, expression), count);
+            }
+            for (const [reading, count] of expectedResults.readings) {
+                assert.strictEqual(countTermsWithReading(results, reading), count);
+            }
+        }
+    }
+}
+
+async function testFindTermMetaBulk1(database, titles) {
+    const data = [
+        {
+            inputs: [
+                {
+                    termList: ['打']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                modes: [
+                    ['freq', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: ['打つ']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                modes: [
+                    ['freq', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: ['打ち込む']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                modes: [
+                    ['freq', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    termList: ['?']
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                modes: []
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {termList} of inputs) {
+            const results = await database.findTermMetaBulk(termList, titles);
+            assert.strictEqual(results.length, expectedResults.total);
+            for (const [mode, count] of expectedResults.modes) {
+                assert.strictEqual(countMetasWithMode(results, mode), count);
+            }
+        }
+    }
+}
+
+async function testFindKanjiBulk1(database, titles) {
+    const data = [
+        {
+            inputs: [
+                {
+                    kanjiList: ['打']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                kanji: [
+                    ['打', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    kanjiList: ['込']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                kanji: [
+                    ['込', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    kanjiList: ['?']
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                kanji: []
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {kanjiList} of inputs) {
+            const results = await database.findKanjiBulk(kanjiList, titles);
+            assert.strictEqual(results.length, expectedResults.total);
+            for (const [kanji, count] of expectedResults.kanji) {
+                assert.strictEqual(countKanjiWithCharacter(results, kanji), count);
+            }
+        }
+    }
+}
+
+async function testFindKanjiMetaBulk1(database, titles) {
+    const data = [
+        {
+            inputs: [
+                {
+                    kanjiList: ['打']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                modes: [
+                    ['freq', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    kanjiList: ['込']
+                }
+            ],
+            expectedResults: {
+                total: 1,
+                modes: [
+                    ['freq', 1]
+                ]
+            }
+        },
+        {
+            inputs: [
+                {
+                    kanjiList: ['?']
+                }
+            ],
+            expectedResults: {
+                total: 0,
+                modes: []
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {kanjiList} of inputs) {
+            const results = await database.findKanjiMetaBulk(kanjiList, titles);
+            assert.strictEqual(results.length, expectedResults.total);
+            for (const [mode, count] of expectedResults.modes) {
+                assert.strictEqual(countMetasWithMode(results, mode), count);
+            }
+        }
+    }
+}
+
+async function testFindTagForTitle1(database, title) {
+    const data = [
+        {
+            inputs: [
+                {
+                    name: 'tag1'
+                }
+            ],
+            expectedResults: {
+                value: {category: 'category1', dictionary: title, name: 'tag1', notes: 'tag1 notes', order: 0, score: 0}
+            }
+        },
+        {
+            inputs: [
+                {
+                    name: 'ktag1'
+                }
+            ],
+            expectedResults: {
+                value: {category: 'kcategory1', dictionary: title, name: 'ktag1', notes: 'ktag1 notes', order: 0, score: 0}
+            }
+        },
+        {
+            inputs: [
+                {
+                    name: 'kstat1'
+                }
+            ],
+            expectedResults: {
+                value: {category: 'kcategory3', dictionary: title, name: 'kstat1', notes: 'kstat1 notes', order: 0, score: 0}
+            }
+        },
+        {
+            inputs: [
+                {
+                    name: 'invalid'
+                }
+            ],
+            expectedResults: {
+                value: null
+            }
+        }
+    ];
+
+    for (const {inputs, expectedResults} of data) {
+        for (const {name} of inputs) {
+            const result = await database.findTagForTitle(name, title);
+            assert.deepStrictEqual(result, expectedResults.value);
+        }
+    }
+}
+
+
+async function main() {
+    await testDatabase1();
+}
+
+
+if (require.main === module) { main(); }
-- 
cgit v1.2.3


From a31ac6857430ed7bea1e1500ef5643caca9b4347 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:20:00 -0500
Subject: Update tests

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4190741a..2bbc6a79 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "scripts": {
         "test": "npm run test-lint && npm run test-code",
         "test-lint": "eslint .",
-        "test-code": "node ./test/test-schema.js"
+        "test-code": "node ./test/test-schema.js && node ./test/test-dictionary.js && node ./test/test-database.js"
     },
     "repository": {
         "type": "git",
-- 
cgit v1.2.3


From 7901a467217f311566e7a3bc83ceafa17909d511 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 19 Feb 2020 18:46:27 -0500
Subject: Validate results of importDictionary

---
 test/test-database.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/test-database.js b/test/test-database.js
index b9ac8a46..d66e2137 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -83,26 +83,30 @@ async function testDatabase1() {
     await database.prepare();
 
     for (const {cleanup} of iterations) {
+        const expectedSummary = {
+            title,
+            revision: 'test',
+            sequenced: true,
+            version: 3,
+            prefixWildcardsSupported: true
+        };
+
         // Import data
         let progressEvent = false;
-        await database.importDictionary(
+        const {result, errors} = await database.importDictionary(
             testDictionarySource,
             () => {
                 progressEvent = true;
             },
             {prefixWildcardsSupported: true}
         );
+        assert.deepStrictEqual(errors, []);
+        assert.deepStrictEqual(result, expectedSummary);
         assert.ok(progressEvent);
 
         // Get info summary
         const info = await database.getDictionaryInfo();
-        assert.deepStrictEqual(info, [{
-            title,
-            revision: 'test',
-            sequenced: true,
-            version: 3,
-            prefixWildcardsSupported: true
-        }]);
+        assert.deepStrictEqual(info, [expectedSummary]);
 
         // Get counts
         const counts = await database.getDictionaryCounts(
-- 
cgit v1.2.3


From a8b1e40a1e34178d9907b04f3a8e16a21b9eb42a Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 19 Feb 2020 19:59:24 -0500
Subject: Close to prevent hangs

---
 ext/bg/js/database.js | 6 ++++++
 test/test-database.js | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index b54d832c..02d59c83 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -96,6 +96,12 @@ class Database {
         }
     }
 
+    async close() {
+        this.validate();
+        this.db.close();
+        this.db = null;
+    }
+
     async purge() {
         this.validate();
 
diff --git a/test/test-database.js b/test/test-database.js
index d66e2137..cefa297c 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -130,6 +130,8 @@ async function testDatabase1() {
         // Cleanup
         await cleanup();
     }
+
+    await database.close();
 }
 
 async function testDatabaseEmpty1(database) {
-- 
cgit v1.2.3


From 4f39ac207917c6f4cd1f840ccf338137785e99cc Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 19 Feb 2020 20:00:27 -0500
Subject: Upadte eslintrc

---
 .eslintrc.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index a350bce4..9b0754fc 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -72,11 +72,15 @@
         },
         {
             "files": ["test/**/*.js"],
+            "parserOptions": {
+                "ecmaVersion": 8,
+                "sourceType": "module"
+            },
             "env": {
                 "browser": false,
-                "es2017": false,
-                "webextensions": false,
-                "node": true
+                "es2017": true,
+                "node": true,
+                "webextensions": false
             }
         }
     ]
-- 
cgit v1.2.3


From 1e573f36c416b3955b2e679c8f3ce7ffa91bf504 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 19 Feb 2020 20:00:44 -0500
Subject: Test some errors

---
 test/test-database.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/test/test-database.js b/test/test-database.js
index cefa297c..fcf519d7 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -39,6 +39,18 @@ function countKanjiWithCharacter(kanji, character) {
 }
 
 
+async function clearDatabase() {
+    const indexedDB = global.indexedDB;
+    for (const {name} of await indexedDB.databases()) {
+        await new Promise((resolve, reject) => {
+            const request = indexedDB.deleteDatabase(name);
+            request.onerror = (e) => reject(e);
+            request.onsuccess = () => resolve();
+        });
+    }
+}
+
+
 async function testDatabase1() {
     // Load dictionary data
     const testDictionary = yomichanTest.createTestDictionaryArchive();
@@ -718,8 +730,53 @@ async function testFindTagForTitle1(database, title) {
 }
 
 
+async function testDatabase2() {
+    // Load dictionary data
+    const testDictionary = yomichanTest.createTestDictionaryArchive();
+    const testDictionarySource = await testDictionary.generateAsync({type: 'string'});
+    const testDictionaryIndex = JSON.parse(await testDictionary.files['index.json'].async('string'));
+
+    const title = testDictionaryIndex.title;
+    const titles = [title];
+
+    // Setup database
+    const database = new Database();
+
+    // Error: not prepared
+    await assert.rejects(async () => await database.purge());
+    await assert.rejects(async () => await database.deleteDictionary(title, () => {}, {}));
+    await assert.rejects(async () => await database.findTermsBulk(['?'], titles, null));
+    await assert.rejects(async () => await database.findTermsExactBulk(['?'], ['?'], titles));
+    await assert.rejects(async () => await database.findTermsBySequenceBulk([1], title));
+    await assert.rejects(async () => await database.findTermMetaBulk(['?'], titles));
+    await assert.rejects(async () => await database.findTermMetaBulk(['?'], titles));
+    await assert.rejects(async () => await database.findKanjiBulk(['?'], titles));
+    await assert.rejects(async () => await database.findKanjiMetaBulk(['?'], titles));
+    await assert.rejects(async () => await database.findTagForTitle('tag', title));
+    await assert.rejects(async () => await database.getDictionaryInfo());
+    await assert.rejects(async () => await database.getDictionaryCounts(titles, true));
+    await assert.rejects(async () => await database.importDictionary(testDictionarySource, () => {}, {}));
+
+    await database.prepare();
+
+    // Error: already prepared
+    await assert.rejects(async () => await database.prepare());
+
+    await database.importDictionary(testDictionarySource, () => {}, {});
+
+    // Error: dictionary already imported
+    await assert.rejects(async () => await database.importDictionary(testDictionarySource, () => {}, {}));
+
+    await database.close();
+}
+
+
 async function main() {
     await testDatabase1();
+    await clearDatabase();
+
+    await testDatabase2();
+    await clearDatabase();
 }
 
 
-- 
cgit v1.2.3


From 212e5428e81ad98f8af64eb3a6d2ab9d5b93f645 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 16:16:08 -0500
Subject: Mark private functions in database.js

---
 ext/bg/js/database.js | 174 ++++++++++++++++++++++++++------------------------
 1 file changed, 89 insertions(+), 85 deletions(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 02d59c83..7d3019bf 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -23,14 +23,16 @@ class Database {
         this.db = null;
     }
 
+    // Public
+
     async prepare() {
         if (this.db !== null) {
             throw new Error('Database already initialized');
         }
 
         try {
-            this.db = await Database.open('dict', 5, (db, transaction, oldVersion) => {
-                Database.upgrade(db, transaction, oldVersion, [
+            this.db = await Database._open('dict', 5, (db, transaction, oldVersion) => {
+                Database._upgrade(db, transaction, oldVersion, [
                     {
                         version: 2,
                         stores: {
@@ -103,17 +105,17 @@ class Database {
     }
 
     async purge() {
-        this.validate();
+        this._validate();
 
         this.db.close();
-        await Database.deleteDatabase(this.db.name);
+        await Database._deleteDatabase(this.db.name);
         this.db = null;
 
         await this.prepare();
     }
 
     async deleteDictionary(dictionaryName, onProgress, progressSettings) {
-        this.validate();
+        this._validate();
 
         const targets = [
             ['dictionaries', 'title'],
@@ -140,14 +142,14 @@ class Database {
             const dbObjectStore = dbTransaction.objectStore(objectStoreName);
             const dbIndex = dbObjectStore.index(index);
             const only = IDBKeyRange.only(dictionaryName);
-            promises.push(Database.deleteValues(dbObjectStore, dbIndex, only, onProgress, progressData, progressRate));
+            promises.push(Database._deleteValues(dbObjectStore, dbIndex, only, onProgress, progressData, progressRate));
         }
 
         await Promise.all(promises);
     }
 
     async findTermsBulk(termList, titles, wildcard) {
-        this.validate();
+        this._validate();
 
         const promises = [];
         const visited = {};
@@ -155,7 +157,7 @@ class Database {
         const processRow = (row, index) => {
             if (titles.includes(row.dictionary) && !hasOwn(visited, row.id)) {
                 visited[row.id] = true;
-                results.push(Database.createTerm(row, index));
+                results.push(Database._createTerm(row, index));
             }
         };
 
@@ -171,8 +173,8 @@ class Database {
             const term = prefixWildcard ? stringReverse(termList[i]) : termList[i];
             const query = useWildcard ? IDBKeyRange.bound(term, `${term}\uffff`, false, false) : IDBKeyRange.only(term);
             promises.push(
-                Database.getAll(dbIndex1, query, i, processRow),
-                Database.getAll(dbIndex2, query, i, processRow)
+                Database._getAll(dbIndex1, query, i, processRow),
+                Database._getAll(dbIndex2, query, i, processRow)
             );
         }
 
@@ -182,13 +184,13 @@ class Database {
     }
 
     async findTermsExactBulk(termList, readingList, titles) {
-        this.validate();
+        this._validate();
 
         const promises = [];
         const results = [];
         const processRow = (row, index) => {
             if (row.reading === readingList[index] && titles.includes(row.dictionary)) {
-                results.push(Database.createTerm(row, index));
+                results.push(Database._createTerm(row, index));
             }
         };
 
@@ -198,7 +200,7 @@ class Database {
 
         for (let i = 0; i < termList.length; ++i) {
             const only = IDBKeyRange.only(termList[i]);
-            promises.push(Database.getAll(dbIndex, only, i, processRow));
+            promises.push(Database._getAll(dbIndex, only, i, processRow));
         }
 
         await Promise.all(promises);
@@ -207,13 +209,13 @@ class Database {
     }
 
     async findTermsBySequenceBulk(sequenceList, mainDictionary) {
-        this.validate();
+        this._validate();
 
         const promises = [];
         const results = [];
         const processRow = (row, index) => {
             if (row.dictionary === mainDictionary) {
-                results.push(Database.createTerm(row, index));
+                results.push(Database._createTerm(row, index));
             }
         };
 
@@ -223,7 +225,7 @@ class Database {
 
         for (let i = 0; i < sequenceList.length; ++i) {
             const only = IDBKeyRange.only(sequenceList[i]);
-            promises.push(Database.getAll(dbIndex, only, i, processRow));
+            promises.push(Database._getAll(dbIndex, only, i, processRow));
         }
 
         await Promise.all(promises);
@@ -232,51 +234,26 @@ class Database {
     }
 
     async findTermMetaBulk(termList, titles) {
-        return this.findGenericBulk('termMeta', 'expression', termList, titles, Database.createTermMeta);
+        return this._findGenericBulk('termMeta', 'expression', termList, titles, Database._createTermMeta);
     }
 
     async findKanjiBulk(kanjiList, titles) {
-        return this.findGenericBulk('kanji', 'character', kanjiList, titles, Database.createKanji);
+        return this._findGenericBulk('kanji', 'character', kanjiList, titles, Database._createKanji);
     }
 
     async findKanjiMetaBulk(kanjiList, titles) {
-        return this.findGenericBulk('kanjiMeta', 'character', kanjiList, titles, Database.createKanjiMeta);
-    }
-
-    async findGenericBulk(tableName, indexName, indexValueList, titles, createResult) {
-        this.validate();
-
-        const promises = [];
-        const results = [];
-        const processRow = (row, index) => {
-            if (titles.includes(row.dictionary)) {
-                results.push(createResult(row, index));
-            }
-        };
-
-        const dbTransaction = this.db.transaction([tableName], 'readonly');
-        const dbTerms = dbTransaction.objectStore(tableName);
-        const dbIndex = dbTerms.index(indexName);
-
-        for (let i = 0; i < indexValueList.length; ++i) {
-            const only = IDBKeyRange.only(indexValueList[i]);
-            promises.push(Database.getAll(dbIndex, only, i, processRow));
-        }
-
-        await Promise.all(promises);
-
-        return results;
+        return this._findGenericBulk('kanjiMeta', 'character', kanjiList, titles, Database._createKanjiMeta);
     }
 
     async findTagForTitle(name, title) {
-        this.validate();
+        this._validate();
 
         let result = null;
         const dbTransaction = this.db.transaction(['tagMeta'], 'readonly');
         const dbTerms = dbTransaction.objectStore('tagMeta');
         const dbIndex = dbTerms.index('name');
         const only = IDBKeyRange.only(name);
-        await Database.getAll(dbIndex, only, null, (row) => {
+        await Database._getAll(dbIndex, only, null, (row) => {
             if (title === row.dictionary) {
                 result = row;
             }
@@ -286,19 +263,19 @@ class Database {
     }
 
     async getDictionaryInfo() {
-        this.validate();
+        this._validate();
 
         const results = [];
         const dbTransaction = this.db.transaction(['dictionaries'], 'readonly');
         const dbDictionaries = dbTransaction.objectStore('dictionaries');
 
-        await Database.getAll(dbDictionaries, null, null, (info) => results.push(info));
+        await Database._getAll(dbDictionaries, null, null, (info) => results.push(info));
 
         return results;
     }
 
     async getDictionaryCounts(dictionaryNames, getTotal) {
-        this.validate();
+        this._validate();
 
         const objectStoreNames = [
             'kanji',
@@ -319,7 +296,7 @@ class Database {
 
         // Query is required for Edge, otherwise index.count throws an exception.
         const query1 = IDBKeyRange.lowerBound('', false);
-        const totalPromise = getTotal ? Database.getCounts(targets, query1) : null;
+        const totalPromise = getTotal ? Database._getCounts(targets, query1) : null;
 
         const counts = [];
         const countPromises = [];
@@ -327,7 +304,7 @@ class Database {
             counts.push(null);
             const index = i;
             const query2 = IDBKeyRange.only(dictionaryNames[i]);
-            const countPromise = Database.getCounts(targets, query2).then((v) => counts[index] = v);
+            const countPromise = Database._getCounts(targets, query2).then((v) => counts[index] = v);
             countPromises.push(countPromise);
         }
         await Promise.all(countPromises);
@@ -340,7 +317,7 @@ class Database {
     }
 
     async importDictionary(archive, progressCallback, details) {
-        this.validate();
+        this._validate();
 
         const errors = [];
         const prefixWildcardsSupported = details.prefixWildcardsSupported;
@@ -357,7 +334,7 @@ class Database {
                     const count = Math.min(maxTransactionLength, items.length - i);
                     const transaction = db.transaction([objectStoreName], 'readwrite');
                     const objectStore = transaction.objectStore(objectStoreName);
-                    await Database.bulkAdd(objectStore, items, i, count);
+                    await Database._bulkAdd(objectStore, items, i, count);
                 } catch (e) {
                     errors.push(e);
                 }
@@ -373,7 +350,7 @@ class Database {
             const dbCountTransaction = db.transaction(['dictionaries'], 'readonly');
             const dbIndex = dbCountTransaction.objectStore('dictionaries').index('title');
             const only = IDBKeyRange.only(summary.title);
-            const count = await Database.getCount(dbIndex, only);
+            const count = await Database._getCount(dbIndex, only);
 
             if (count > 0) {
                 throw new Error('Dictionary is already imported');
@@ -381,7 +358,7 @@ class Database {
 
             const transaction = db.transaction(['dictionaries'], 'readwrite');
             const objectStore = transaction.objectStore('dictionaries');
-            await Database.bulkAdd(objectStore, [summary], 0, 1);
+            await Database._bulkAdd(objectStore, [summary], 0, 1);
         };
 
         const termDataLoaded = async (summary, entries, total, current) => {
@@ -500,7 +477,7 @@ class Database {
             await bulkAdd('tagMeta', rows, total, current);
         };
 
-        const result = await Database.importDictionaryZip(
+        const result = await Database._importDictionaryZip(
             archive,
             indexDataLoaded,
             termDataLoaded,
@@ -514,13 +491,40 @@ class Database {
         return {result, errors};
     }
 
-    validate() {
+    // Private
+
+    _validate() {
         if (this.db === null) {
             throw new Error('Database not initialized');
         }
     }
 
-    static async importDictionaryZip(
+    async _findGenericBulk(tableName, indexName, indexValueList, titles, createResult) {
+        this._validate();
+
+        const promises = [];
+        const results = [];
+        const processRow = (row, index) => {
+            if (titles.includes(row.dictionary)) {
+                results.push(createResult(row, index));
+            }
+        };
+
+        const dbTransaction = this.db.transaction([tableName], 'readonly');
+        const dbTerms = dbTransaction.objectStore(tableName);
+        const dbIndex = dbTerms.index(indexName);
+
+        for (let i = 0; i < indexValueList.length; ++i) {
+            const only = IDBKeyRange.only(indexValueList[i]);
+            promises.push(Database._getAll(dbIndex, only, i, processRow));
+        }
+
+        await Promise.all(promises);
+
+        return results;
+    }
+
+    static async _importDictionaryZip(
         archive,
         indexDataLoaded,
         termDataLoaded,
@@ -610,7 +614,7 @@ class Database {
         return summary;
     }
 
-    static createTerm(row, index) {
+    static _createTerm(row, index) {
         return {
             index,
             expression: row.expression,
@@ -626,7 +630,7 @@ class Database {
         };
     }
 
-    static createKanji(row, index) {
+    static _createKanji(row, index) {
         return {
             index,
             character: row.character,
@@ -639,20 +643,20 @@ class Database {
         };
     }
 
-    static createTermMeta({expression, mode, data, dictionary}, index) {
+    static _createTermMeta({expression, mode, data, dictionary}, index) {
         return {expression, mode, data, dictionary, index};
     }
 
-    static createKanjiMeta({character, mode, data, dictionary}, index) {
+    static _createKanjiMeta({character, mode, data, dictionary}, index) {
         return {character, mode, data, dictionary, index};
     }
 
-    static getAll(dbIndex, query, context, processRow) {
-        const fn = typeof dbIndex.getAll === 'function' ? Database.getAllFast : Database.getAllUsingCursor;
+    static _getAll(dbIndex, query, context, processRow) {
+        const fn = typeof dbIndex.getAll === 'function' ? Database._getAllFast : Database._getAllUsingCursor;
         return fn(dbIndex, query, context, processRow);
     }
 
-    static getAllFast(dbIndex, query, context, processRow) {
+    static _getAllFast(dbIndex, query, context, processRow) {
         return new Promise((resolve, reject) => {
             const request = dbIndex.getAll(query);
             request.onerror = (e) => reject(e);
@@ -665,7 +669,7 @@ class Database {
         });
     }
 
-    static getAllUsingCursor(dbIndex, query, context, processRow) {
+    static _getAllUsingCursor(dbIndex, query, context, processRow) {
         return new Promise((resolve, reject) => {
             const request = dbIndex.openCursor(query, 'next');
             request.onerror = (e) => reject(e);
@@ -681,18 +685,18 @@ class Database {
         });
     }
 
-    static getCounts(targets, query) {
+    static _getCounts(targets, query) {
         const countPromises = [];
         const counts = {};
         for (const [objectStoreName, index] of targets) {
             const n = objectStoreName;
-            const countPromise = Database.getCount(index, query).then((count) => counts[n] = count);
+            const countPromise = Database._getCount(index, query).then((count) => counts[n] = count);
             countPromises.push(countPromise);
         }
         return Promise.all(countPromises).then(() => counts);
     }
 
-    static getCount(dbIndex, query) {
+    static _getCount(dbIndex, query) {
         return new Promise((resolve, reject) => {
             const request = dbIndex.count(query);
             request.onerror = (e) => reject(e);
@@ -700,12 +704,12 @@ class Database {
         });
     }
 
-    static getAllKeys(dbIndex, query) {
-        const fn = typeof dbIndex.getAllKeys === 'function' ? Database.getAllKeysFast : Database.getAllKeysUsingCursor;
+    static _getAllKeys(dbIndex, query) {
+        const fn = typeof dbIndex.getAllKeys === 'function' ? Database._getAllKeysFast : Database._getAllKeysUsingCursor;
         return fn(dbIndex, query);
     }
 
-    static getAllKeysFast(dbIndex, query) {
+    static _getAllKeysFast(dbIndex, query) {
         return new Promise((resolve, reject) => {
             const request = dbIndex.getAllKeys(query);
             request.onerror = (e) => reject(e);
@@ -713,7 +717,7 @@ class Database {
         });
     }
 
-    static getAllKeysUsingCursor(dbIndex, query) {
+    static _getAllKeysUsingCursor(dbIndex, query) {
         return new Promise((resolve, reject) => {
             const primaryKeys = [];
             const request = dbIndex.openKeyCursor(query, 'next');
@@ -730,9 +734,9 @@ class Database {
         });
     }
 
-    static async deleteValues(dbObjectStore, dbIndex, query, onProgress, progressData, progressRate) {
+    static async _deleteValues(dbObjectStore, dbIndex, query, onProgress, progressData, progressRate) {
         const hasProgress = (typeof onProgress === 'function');
-        const count = await Database.getCount(dbIndex, query);
+        const count = await Database._getCount(dbIndex, query);
         ++progressData.storesProcesed;
         progressData.count += count;
         if (hasProgress) {
@@ -751,16 +755,16 @@ class Database {
         );
 
         const promises = [];
-        const primaryKeys = await Database.getAllKeys(dbIndex, query);
+        const primaryKeys = await Database._getAllKeys(dbIndex, query);
         for (const key of primaryKeys) {
-            const promise = Database.deleteValue(dbObjectStore, key).then(onValueDeleted);
+            const promise = Database._deleteValue(dbObjectStore, key).then(onValueDeleted);
             promises.push(promise);
         }
 
         await Promise.all(promises);
     }
 
-    static deleteValue(dbObjectStore, key) {
+    static _deleteValue(dbObjectStore, key) {
         return new Promise((resolve, reject) => {
             const request = dbObjectStore.delete(key);
             request.onerror = (e) => reject(e);
@@ -768,7 +772,7 @@ class Database {
         });
     }
 
-    static bulkAdd(objectStore, items, start, count) {
+    static _bulkAdd(objectStore, items, start, count) {
         return new Promise((resolve, reject) => {
             if (start + count > items.length) {
                 count = items.length - start;
@@ -796,7 +800,7 @@ class Database {
         });
     }
 
-    static open(name, version, onUpgradeNeeded) {
+    static _open(name, version, onUpgradeNeeded) {
         return new Promise((resolve, reject) => {
             const request = window.indexedDB.open(name, version * 10);
 
@@ -814,7 +818,7 @@ class Database {
         });
     }
 
-    static upgrade(db, transaction, oldVersion, upgrades) {
+    static _upgrade(db, transaction, oldVersion, upgrades) {
         for (const {version, stores} of upgrades) {
             if (oldVersion >= version) { continue; }
 
@@ -824,13 +828,13 @@ class Database {
 
                 const objectStoreNames = transaction.objectStoreNames || db.objectStoreNames;
                 const objectStore = (
-                    Database.listContains(objectStoreNames, objectStoreName) ?
+                    Database._listContains(objectStoreNames, objectStoreName) ?
                     transaction.objectStore(objectStoreName) :
                     db.createObjectStore(objectStoreName, primaryKey)
                 );
 
                 for (const indexName of indices) {
-                    if (Database.listContains(objectStore.indexNames, indexName)) { continue; }
+                    if (Database._listContains(objectStore.indexNames, indexName)) { continue; }
 
                     objectStore.createIndex(indexName, indexName, {});
                 }
@@ -838,7 +842,7 @@ class Database {
         }
     }
 
-    static deleteDatabase(dbName) {
+    static _deleteDatabase(dbName) {
         return new Promise((resolve, reject) => {
             const request = indexedDB.deleteDatabase(dbName);
             request.onerror = (e) => reject(e);
@@ -846,7 +850,7 @@ class Database {
         });
     }
 
-    static listContains(list, value) {
+    static _listContains(list, value) {
         for (let i = 0, ii = list.length; i < ii; ++i) {
             if (list[i] === value) { return true; }
         }
-- 
cgit v1.2.3


From 177bca4865f615dff5618aff13248777d34081a6 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 18:17:12 -0500
Subject: Create new dictionary import function

---
 ext/bg/js/database.js | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 7d3019bf..51e8d359 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -316,6 +316,169 @@ class Database {
         return result;
     }
 
+    async importDictionaryNew(archiveSource, onProgress, details) {
+        this._validate();
+        const db = this.db;
+        const hasOnProgress = (typeof onProgress === 'function');
+
+        // Read archive
+        const archive = await JSZip.loadAsync(archiveSource);
+
+        // Read and validate index
+        const indexFile = archive.files['index.json'];
+        if (!indexFile) {
+            throw new Error('No dictionary index found in archive');
+        }
+
+        const index = JSON.parse(await indexFile.async('string'));
+
+        const dictionaryTitle = index.title;
+        const version = index.format || index.version;
+
+        if (!dictionaryTitle || !index.revision) {
+            throw new Error('Unrecognized dictionary format');
+        }
+
+        // Verify database is not already imported
+        if (await this._dictionaryExists(dictionaryTitle)) {
+            throw new Error('Dictionary is already imported');
+        }
+
+        // Data format converters
+        const convertTermBankEntry = (entry) => {
+            if (version === 1) {
+                const [expression, reading, definitionTags, rules, score, ...glossary] = entry;
+                return {expression, reading, definitionTags, rules, score, glossary};
+            } else {
+                const [expression, reading, definitionTags, rules, score, glossary, sequence, termTags] = entry;
+                return {expression, reading, definitionTags, rules, score, glossary, sequence, termTags};
+            }
+        };
+
+        const convertTermMetaBankEntry = (entry) => {
+            const [expression, mode, data] = entry;
+            return {expression, mode, data};
+        };
+
+        const convertKanjiBankEntry = (entry) => {
+            if (version === 1) {
+                const [character, onyomi, kunyomi, tags, ...meanings] = entry;
+                return {character, onyomi, kunyomi, tags, meanings};
+            } else {
+                const [character, onyomi, kunyomi, tags, meanings, stats] = entry;
+                return {character, onyomi, kunyomi, tags, meanings, stats};
+            }
+        };
+
+        const convertKanjiMetaBankEntry = (entry) => {
+            const [character, mode, data] = entry;
+            return {character, mode, data};
+        };
+
+        const convertTagBankEntry = (entry) => {
+            const [name, category, order, notes, score] = entry;
+            return {name, category, order, notes, score};
+        };
+
+        // Archive file reading
+        const readFileSequence = async (fileNameFormat, convertEntry) => {
+            const results = [];
+            for (let i = 1; true; ++i) {
+                const fileName = fileNameFormat.replace(/\?/, `${i}`);
+                const file = archive.files[fileName];
+                if (!file) { break; }
+
+                const entries = JSON.parse(await file.async('string'));
+                for (let entry of entries) {
+                    entry = convertEntry(entry);
+                    entry.dictionary = dictionaryTitle;
+                    results.push(entry);
+                }
+            }
+            return results;
+        };
+
+        // Load data
+        const termList      = await readFileSequence('term_bank_?.json',       convertTermBankEntry);
+        const termMetaList  = await readFileSequence('term_meta_bank_?.json',  convertTermMetaBankEntry);
+        const kanjiList     = await readFileSequence('kanji_bank_?.json',      convertKanjiBankEntry);
+        const kanjiMetaList = await readFileSequence('kanji_meta_bank_?.json', convertKanjiMetaBankEntry);
+        const tagList       = await readFileSequence('tag_bank_?.json',        convertTagBankEntry);
+
+        // Old tags
+        const indexTagMeta = index.tagMeta;
+        if (typeof indexTagMeta === 'object' && indexTagMeta !== null) {
+            for (const name of Object.keys(indexTagMeta)) {
+                const {category, order, notes, score} = indexTagMeta[name];
+                tagList.push({name, category, order, notes, score});
+            }
+        }
+
+        // Prefix wildcard support
+        const prefixWildcardsSupported = !!details.prefixWildcardsSupported;
+        if (prefixWildcardsSupported) {
+            for (const entry of termList) {
+                entry.expressionReverse = stringReverse(entry.expression);
+                entry.readingReverse = stringReverse(entry.reading);
+            }
+        }
+
+        // Add dictionary
+        const summary = {
+            title: dictionaryTitle,
+            revision: index.revision,
+            sequenced: index.sequenced,
+            version,
+            prefixWildcardsSupported
+        };
+
+        {
+            const transaction = db.transaction(['dictionaries'], 'readwrite');
+            const objectStore = transaction.objectStore('dictionaries');
+            await Database._bulkAdd(objectStore, [summary], 0, 1);
+        }
+
+        // Add data
+        const errors = [];
+        const total = (
+            termList.length +
+            termMetaList.length +
+            kanjiList.length +
+            kanjiMetaList.length +
+            tagList.length
+        );
+        let loadedCount = 0;
+        const maxTransactionLength = 1000;
+
+        const bulkAdd = async (objectStoreName, entries) => {
+            const ii = entries.length;
+            for (let i = 0; i < ii; i += maxTransactionLength) {
+                const count = Math.min(maxTransactionLength, ii - i);
+
+                try {
+                    const transaction = db.transaction([objectStoreName], 'readwrite');
+                    const objectStore = transaction.objectStore(objectStoreName);
+                    await Database._bulkAdd(objectStore, entries, i, count);
+                } catch (e) {
+                    errors.push(e);
+                }
+
+                loadedCount += count;
+                if (hasOnProgress) {
+                    onProgress(total, loadedCount);
+                }
+            }
+        };
+
+        await bulkAdd('terms', termList);
+        await bulkAdd('termMeta', termMetaList);
+        await bulkAdd('kanji', kanjiList);
+        await bulkAdd('kanjiMeta', kanjiMetaList);
+        await bulkAdd('tagMeta', tagList);
+
+        return {result: summary, errors};
+    }
+
     async importDictionary(archive, progressCallback, details) {
         this._validate();
 
@@ -499,6 +662,15 @@ class Database {
         }
     }
 
+    async _dictionaryExists(title) {
+        const db = this.db;
+        const dbCountTransaction = db.transaction(['dictionaries'], 'readonly');
+        const dbIndex = dbCountTransaction.objectStore('dictionaries').index('title');
+        const only = IDBKeyRange.only(title);
+        const count = await Database._getCount(dbIndex, only);
+        return count > 0;
+    }
+
     async _findGenericBulk(tableName, indexName, indexValueList, titles, createResult) {
         this._validate();
 
-- 
cgit v1.2.3


From d620f40448928d3bd3dc8bbafd95bedd177c9975 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 18:19:11 -0500
Subject: Remove old dictionary import functions

---
 ext/bg/js/database.js | 269 +-------------------------------------------------
 1 file changed, 2 insertions(+), 267 deletions(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 51e8d359..f85ac7f3 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global dictFieldSplit, dictTagSanitize, JSZip*/
+/*global dictFieldSplit, JSZip*/
 
 class Database {
     constructor() {
@@ -316,7 +316,7 @@ class Database {
         return result;
     }
 
-    async importDictionaryNew(archiveSource, onProgress, details) {
+    async importDictionary(archiveSource, onProgress, details) {
         this._validate();
         const db = this.db;
         const hasOnProgress = (typeof onProgress === 'function');
@@ -479,181 +479,6 @@ class Database {
         return {result: summary, errors};
     }
 
-    async importDictionary(archive, progressCallback, details) {
-        this._validate();
-
-        const errors = [];
-        const prefixWildcardsSupported = details.prefixWildcardsSupported;
-
-        const maxTransactionLength = 1000;
-        const bulkAdd = async (objectStoreName, items, total, current) => {
-            const db = this.db;
-            for (let i = 0; i < items.length; i += maxTransactionLength) {
-                if (progressCallback) {
-                    progressCallback(total, current + i / items.length);
-                }
-
-                try {
-                    const count = Math.min(maxTransactionLength, items.length - i);
-                    const transaction = db.transaction([objectStoreName], 'readwrite');
-                    const objectStore = transaction.objectStore(objectStoreName);
-                    await Database._bulkAdd(objectStore, items, i, count);
-                } catch (e) {
-                    errors.push(e);
-                }
-            }
-        };
-
-        const indexDataLoaded = async (summary) => {
-            if (summary.version > 3) {
-                throw new Error('Unsupported dictionary version');
-            }
-
-            const db = this.db;
-            const dbCountTransaction = db.transaction(['dictionaries'], 'readonly');
-            const dbIndex = dbCountTransaction.objectStore('dictionaries').index('title');
-            const only = IDBKeyRange.only(summary.title);
-            const count = await Database._getCount(dbIndex, only);
-
-            if (count > 0) {
-                throw new Error('Dictionary is already imported');
-            }
-
-            const transaction = db.transaction(['dictionaries'], 'readwrite');
-            const objectStore = transaction.objectStore('dictionaries');
-            await Database._bulkAdd(objectStore, [summary], 0, 1);
-        };
-
-        const termDataLoaded = async (summary, entries, total, current) => {
-            const rows = [];
-            if (summary.version === 1) {
-                for (const [expression, reading, definitionTags, rules, score, ...glossary] of entries) {
-                    rows.push({
-                        expression,
-                        reading,
-                        definitionTags,
-                        rules,
-                        score,
-                        glossary,
-                        dictionary: summary.title
-                    });
-                }
-            } else {
-                for (const [expression, reading, definitionTags, rules, score, glossary, sequence, termTags] of entries) {
-                    rows.push({
-                        expression,
-                        reading,
-                        definitionTags,
-                        rules,
-                        score,
-                        glossary,
-                        sequence,
-                        termTags,
-                        dictionary: summary.title
-                    });
-                }
-            }
-
-            if (prefixWildcardsSupported) {
-                for (const row of rows) {
-                    row.expressionReverse = stringReverse(row.expression);
-                    row.readingReverse = stringReverse(row.reading);
-                }
-            }
-
-            await bulkAdd('terms', rows, total, current);
-        };
-
-        const termMetaDataLoaded = async (summary, entries, total, current) => {
-            const rows = [];
-            for (const [expression, mode, data] of entries) {
-                rows.push({
-                    expression,
-                    mode,
-                    data,
-                    dictionary: summary.title
-                });
-            }
-
-            await bulkAdd('termMeta', rows, total, current);
-        };
-
-        const kanjiDataLoaded = async (summary, entries, total, current)  => {
-            const rows = [];
-            if (summary.version === 1) {
-                for (const [character, onyomi, kunyomi, tags, ...meanings] of entries) {
-                    rows.push({
-                        character,
-                        onyomi,
-                        kunyomi,
-                        tags,
-                        meanings,
-                        dictionary: summary.title
-                    });
-                }
-            } else {
-                for (const [character, onyomi, kunyomi, tags, meanings, stats] of entries) {
-                    rows.push({
-                        character,
-                        onyomi,
-                        kunyomi,
-                        tags,
-                        meanings,
-                        stats,
-                        dictionary: summary.title
-                    });
-                }
-            }
-
-            await bulkAdd('kanji', rows, total, current);
-        };
-
-        const kanjiMetaDataLoaded = async (summary, entries, total, current) => {
-            const rows = [];
-            for (const [character, mode, data] of entries) {
-                rows.push({
-                    character,
-                    mode,
-                    data,
-                    dictionary: summary.title
-                });
-            }
-
-            await bulkAdd('kanjiMeta', rows, total, current);
-        };
-
-        const tagDataLoaded = async (summary, entries, total, current) => {
-            const rows = [];
-            for (const [name, category, order, notes, score] of entries) {
-                const row = dictTagSanitize({
-                    name,
-                    category,
-                    order,
-                    notes,
-                    score,
-                    dictionary: summary.title
-                });
-
-                rows.push(row);
-            }
-
-            await bulkAdd('tagMeta', rows, total, current);
-        };
-
-        const result = await Database._importDictionaryZip(
-            archive,
-            indexDataLoaded,
-            termDataLoaded,
-            termMetaDataLoaded,
-            kanjiDataLoaded,
-            kanjiMetaDataLoaded,
-            tagDataLoaded,
-            details
-        );
-
-        return {result, errors};
-    }
-
     // Private
 
     _validate() {
@@ -696,96 +521,6 @@ class Database {
         return results;
     }
 
-    static async _importDictionaryZip(
-        archive,
-        indexDataLoaded,
-        termDataLoaded,
-        termMetaDataLoaded,
-        kanjiDataLoaded,
-        kanjiMetaDataLoaded,
-        tagDataLoaded,
-        details
-    ) {
-        const zip = await JSZip.loadAsync(archive);
-
-        const indexFile = zip.files['index.json'];
-        if (!indexFile) {
-            throw new Error('No dictionary index found in archive');
-        }
-
-        const index = JSON.parse(await indexFile.async('string'));
-        if (!index.title || !index.revision) {
-            throw new Error('Unrecognized dictionary format');
-        }
-
-        const summary = {
-            title: index.title,
-            revision: index.revision,
-            sequenced: index.sequenced,
-            version: index.format || index.version,
-            prefixWildcardsSupported: !!details.prefixWildcardsSupported
-        };
-
-        await indexDataLoaded(summary);
-
-        const buildTermBankName      = (index) => `term_bank_${index + 1}.json`;
-        const buildTermMetaBankName  = (index) => `term_meta_bank_${index + 1}.json`;
-        const buildKanjiBankName     = (index) => `kanji_bank_${index + 1}.json`;
-        const buildKanjiMetaBankName = (index) => `kanji_meta_bank_${index + 1}.json`;
-        const buildTagBankName       = (index) => `tag_bank_${index + 1}.json`;
-
-        const countBanks = (namer) => {
-            let count = 0;
-            while (zip.files[namer(count)]) {
-                ++count;
-            }
-
-            return count;
-        };
-
-        const termBankCount      = countBanks(buildTermBankName);
-        const termMetaBankCount  = countBanks(buildTermMetaBankName);
-        const kanjiBankCount     = countBanks(buildKanjiBankName);
-        const kanjiMetaBankCount = countBanks(buildKanjiMetaBankName);
-        const tagBankCount       = countBanks(buildTagBankName);
-
-        let bankLoadedCount = 0;
-        let bankTotalCount =
-            termBankCount +
-            termMetaBankCount +
-            kanjiBankCount +
-            kanjiMetaBankCount +
-            tagBankCount;
-
-        if (tagDataLoaded && index.tagMeta) {
-            const bank = [];
-            for (const name in index.tagMeta) {
-                const tag = index.tagMeta[name];
-                bank.push([name, tag.category, tag.order, tag.notes, tag.score]);
-            }
-
-            tagDataLoaded(summary, bank, ++bankTotalCount, bankLoadedCount++);
-        }
-
-        const loadBank = async (summary, namer, count, callback) => {
-            if (callback) {
-                for (let i = 0; i < count; ++i) {
-                    const bankFile = zip.files[namer(i)];
-                    const bank = JSON.parse(await bankFile.async('string'));
-                    await callback(summary, bank, bankTotalCount, bankLoadedCount++);
-                }
-            }
-        };
-
-        await loadBank(summary, buildTermBankName, termBankCount, termDataLoaded);
-        await loadBank(summary, buildTermMetaBankName, termMetaBankCount, termMetaDataLoaded);
-        await loadBank(summary, buildKanjiBankName, kanjiBankCount, kanjiDataLoaded);
-        await loadBank(summary, buildKanjiMetaBankName, kanjiMetaBankCount, kanjiMetaDataLoaded);
-        await loadBank(summary, buildTagBankName, tagBankCount, tagDataLoaded);
-
-        return summary;
-    }
-
     static _createTerm(row, index) {
         return {
             index,
-- 
cgit v1.2.3


From 086fefc9215b0b4d2a63ad371b1e3302f32d725b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 19:43:44 -0500
Subject: Validate data before importing

---
 ext/bg/js/database.js | 53 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index f85ac7f3..c42b9d89 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global dictFieldSplit, JSZip*/
+/*global dictFieldSplit, requestJson, JsonSchema, JSZip*/
 
 class Database {
     constructor() {
         this.db = null;
+        this._schemas = new Map();
     }
 
     // Public
@@ -332,6 +333,9 @@ class Database {
 
         const index = JSON.parse(await indexFile.async('string'));
 
+        const indexSchema = await this._getSchema('/bg/data/dictionary-index-schema.json');
+        JsonSchema.validate(index, indexSchema);
+
         const dictionaryTitle = index.title;
         const version = index.format || index.version;
 
@@ -381,7 +385,7 @@ class Database {
         };
 
         // Archive file reading
-        const readFileSequence = async (fileNameFormat, convertEntry) => {
+        const readFileSequence = async (fileNameFormat, convertEntry, schema) => {
             const results = [];
             for (let i = 1; true; ++i) {
                 const fileName = fileNameFormat.replace(/\?/, `${i}`);
@@ -389,6 +393,8 @@ class Database {
                 if (!file) { break; }
 
                 const entries = JSON.parse(await file.async('string'));
+                JsonSchema.validate(entries, schema);
+
                 for (let entry of entries) {
                     entry = convertEntry(entry);
                     entry.dictionary = dictionaryTitle;
@@ -398,12 +404,16 @@ class Database {
             return results;
         };
 
+        // Load schemas
+        const dataBankSchemaPaths = this.constructor._getDataBankSchemaPaths(version);
+        const dataBankSchemas = await Promise.all(dataBankSchemaPaths.map((path) => this._getSchema(path)));
+
         // Load data
-        const termList      = await readFileSequence('term_bank_?.json',       convertTermBankEntry);
-        const termMetaList  = await readFileSequence('term_meta_bank_?.json',  convertTermMetaBankEntry);
-        const kanjiList     = await readFileSequence('kanji_bank_?.json',      convertKanjiBankEntry);
-        const kanjiMetaList = await readFileSequence('kanji_meta_bank_?.json', convertKanjiMetaBankEntry);
-        const tagList       = await readFileSequence('tag_bank_?.json',        convertTagBankEntry);
+        const termList      = await readFileSequence('term_bank_?.json',       convertTermBankEntry,      dataBankSchemas[0]);
+        const termMetaList  = await readFileSequence('term_meta_bank_?.json',  convertTermMetaBankEntry,  dataBankSchemas[1]);
+        const kanjiList     = await readFileSequence('kanji_bank_?.json',      convertKanjiBankEntry,     dataBankSchemas[2]);
+        const kanjiMetaList = await readFileSequence('kanji_meta_bank_?.json', convertKanjiMetaBankEntry, dataBankSchemas[3]);
+        const tagList       = await readFileSequence('tag_bank_?.json',        convertTagBankEntry,       dataBankSchemas[4]);
 
         // Old tags
         const indexTagMeta = index.tagMeta;
@@ -487,6 +497,35 @@ class Database {
         }
     }
 
+    async _getSchema(fileName) {
+        let schemaPromise = this._schemas.get(fileName);
+        if (typeof schemaPromise !== 'undefined') {
+            return schemaPromise;
+        }
+
+        schemaPromise = requestJson(chrome.runtime.getURL(fileName), 'GET');
+        this._schemas.set(fileName, schemaPromise);
+        return schemaPromise;
+    }
+
+    static _getDataBankSchemaPaths(version) {
+        const termBank = (
+            version === 1 ?
+            '/bg/data/dictionary-term-bank-v1-schema.json' :
+            '/bg/data/dictionary-term-bank-v3-schema.json'
+        );
+        const termMetaBank = '/bg/data/dictionary-term-meta-bank-v3-schema.json';
+        const kanjiBank = (
+            version === 1 ?
+            '/bg/data/dictionary-kanji-bank-v1-schema.json' :
+            '/bg/data/dictionary-kanji-bank-v3-schema.json'
+        );
+        const kanjiMetaBank = '/bg/data/dictionary-kanji-meta-bank-v3-schema.json';
+        const tagBank = '/bg/data/dictionary-tag-bank-v3-schema.json';
+
+        return [termBank, termMetaBank, kanjiBank, kanjiMetaBank, tagBank];
+    }
+
     async _dictionaryExists(title) {
         const db = this.db;
         const dbCountTransaction = db.transaction(['dictionaries'], 'readonly');
-- 
cgit v1.2.3


From 62d4f68412687fc27340f3807258d09d1a6c4b10 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 19:46:08 -0500
Subject: Define old tagMeta format in index file

---
 ext/bg/data/dictionary-index-schema.json | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ext/bg/data/dictionary-index-schema.json b/ext/bg/data/dictionary-index-schema.json
index 9865fcc1..fa1a696b 100644
--- a/ext/bg/data/dictionary-index-schema.json
+++ b/ext/bg/data/dictionary-index-schema.json
@@ -27,6 +27,33 @@
         "version": {
             "type": "integer",
             "description": "Alias for format."
+        },
+        "tagMeta": {
+            "type": "object",
+            "description": "Tag information for terms and kanji. This object is obsolete and individual tag files should be used instead.",
+            "additionalProperties": {
+                "type": "object",
+                "description": "Information about a single tag. The object key is the name of the tag.",
+                "properties": {
+                    "category": {
+                        "type": "string",
+                        "description": "Category for the tag."
+                    },
+                    "order": {
+                        "type": "number",
+                        "description": "Sorting order for the tag."
+                    },
+                    "notes": {
+                        "type": "string",
+                        "description": "Notes for the tag."
+                    },
+                    "score": {
+                        "type": "number",
+                        "description": "Score used to determine popularity. Negative values are more rare and positive values are more frequent. This score is also used to sort search results."
+                    }
+                },
+                "additionalProperties": false
+            }
         }
     },
     "anyOf": [
-- 
cgit v1.2.3


From 86d0fb664361251287e6327bc10c6d56c6af5c8c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 19:46:22 -0500
Subject: Require format to be 1, 2, or 3

---
 ext/bg/data/dictionary-index-schema.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/bg/data/dictionary-index-schema.json b/ext/bg/data/dictionary-index-schema.json
index fa1a696b..9311f14c 100644
--- a/ext/bg/data/dictionary-index-schema.json
+++ b/ext/bg/data/dictionary-index-schema.json
@@ -22,11 +22,13 @@
         },
         "format": {
             "type": "integer",
-            "description": "Format of data found in the JSON data files."
+            "description": "Format of data found in the JSON data files.",
+            "enum": [1, 2, 3]
         },
         "version": {
             "type": "integer",
-            "description": "Alias for format."
+            "description": "Alias for format.",
+            "enum": [1, 2, 3]
         },
         "tagMeta": {
             "type": "object",
-- 
cgit v1.2.3


From d76ab91f83db048aa907e0483123feb437336c22 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 12:45:50 -0500
Subject: Update validate function name in close

---
 ext/bg/js/database.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index c42b9d89..a5919868 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -100,7 +100,7 @@ class Database {
     }
 
     async close() {
-        this.validate();
+        this._validate();
         this.db.close();
         this.db = null;
     }
-- 
cgit v1.2.3


From 4daf3435c24592352261c1186626abdc86beefb4 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 12:47:09 -0500
Subject: Update database test

---
 test/test-database.js | 86 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 9 deletions(-)

diff --git a/test/test-database.js b/test/test-database.js
index fcf519d7..801f9925 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -1,3 +1,6 @@
+const fs = require('fs');
+const url = require('url');
+const path = require('path');
 const assert = require('assert');
 const yomichanTest = require('./yomichan-test');
 require('fake-indexeddb/auto');
@@ -5,21 +8,86 @@ require('fake-indexeddb/auto');
 const chrome = {
     runtime: {
         onMessage: {
-            addListener: () => { /* NOP */ }
+            addListener() { /* NOP */ }
+        },
+        getURL(path2) {
+            return url.pathToFileURL(path.join(__dirname, '..', 'ext', path2.replace(/^\//, '')));
         }
     }
 };
 
-const {Database} = yomichanTest.requireScript('ext/bg/js/database.js', ['Database']);
+class XMLHttpRequest {
+    constructor() {
+        this._eventCallbacks = new Map();
+        this._url = '';
+        this._responseText = null;
+    }
+
+    overrideMimeType() {
+        // NOP
+    }
+
+    addEventListener(eventName, callback) {
+        let callbacks = this._eventCallbacks.get(eventName);
+        if (typeof callbacks === 'undefined') {
+            callbacks = [];
+            this._eventCallbacks.set(eventName, callbacks);
+        }
+        callbacks.push(callback);
+    }
+
+    open(action, url) {
+        this._url = url;
+    }
+
+    send() {
+        const filePath = url.fileURLToPath(this._url);
+        Promise.resolve()
+            .then(() => {
+                let source;
+                try {
+                    source = fs.readFileSync(filePath, {encoding: 'utf8'});
+                } catch (e) {
+                    this._trigger('error');
+                    return;
+                }
+                this._responseText = source;
+                this._trigger('load');
+            });
+    }
+
+    get responseText() {
+        return this._responseText;
+    }
+
+    _trigger(eventName, ...args) {
+        const callbacks = this._eventCallbacks.get(eventName);
+        if (typeof callbacks === 'undefined') { return; }
+
+        for (let i = 0, ii = callbacks.length; i < ii; ++i) {
+            callbacks[i](...args);
+        }
+    }
+}
+
+const {JsonSchema} = yomichanTest.requireScript('ext/bg/js/json-schema.js', ['JsonSchema']);
 const {dictFieldSplit, dictTagSanitize} = yomichanTest.requireScript('ext/bg/js/dictionary.js', ['dictFieldSplit', 'dictTagSanitize']);
 const {stringReverse, hasOwn} = yomichanTest.requireScript('ext/mixed/js/core.js', ['stringReverse', 'hasOwn'], {chrome});
-
-global.window = global;
-global.JSZip = yomichanTest.JSZip;
-global.dictFieldSplit = dictFieldSplit;
-global.dictTagSanitize = dictTagSanitize;
-global.stringReverse = stringReverse;
-global.hasOwn = hasOwn;
+const {requestJson} = yomichanTest.requireScript('ext/bg/js/request.js', ['requestJson'], {XMLHttpRequest});
+
+const databaseGlobals = {
+    chrome,
+    JsonSchema,
+    requestJson,
+    stringReverse,
+    hasOwn,
+    dictFieldSplit,
+    dictTagSanitize,
+    indexedDB: global.indexedDB,
+    JSZip: yomichanTest.JSZip
+};
+databaseGlobals.window = databaseGlobals;
+const {Database} = yomichanTest.requireScript('ext/bg/js/database.js', ['Database'], databaseGlobals);
 
 
 function countTermsWithExpression(terms, expression) {
-- 
cgit v1.2.3


From a54f44122a3a245c1b1579c15b2faf9d50c15c55 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 12:58:33 -0500
Subject: Update location of test dictionary data

---
 .../data/dictionaries/valid-dictionary1/index.json |  6 ++++
 .../valid-dictionary1/kanji_bank_1.json            | 42 ++++++++++++++++++++++
 .../valid-dictionary1/kanji_meta_bank_1.json       |  4 +++
 .../dictionaries/valid-dictionary1/tag_bank_1.json |  7 ++++
 .../dictionaries/valid-dictionary1/tag_bank_2.json |  9 +++++
 .../valid-dictionary1/term_bank_1.json             | 34 ++++++++++++++++++
 .../valid-dictionary1/term_meta_bank_1.json        |  5 +++
 test/test-database.js                              |  4 +--
 test/test-dictionary-data/index.json               |  6 ----
 test/test-dictionary-data/kanji_bank_1.json        | 42 ----------------------
 test/test-dictionary-data/kanji_meta_bank_1.json   |  4 ---
 test/test-dictionary-data/tag_bank_1.json          |  7 ----
 test/test-dictionary-data/tag_bank_2.json          |  9 -----
 test/test-dictionary-data/term_bank_1.json         | 34 ------------------
 test/test-dictionary-data/term_meta_bank_1.json    |  5 ---
 test/test-dictionary.js                            |  2 +-
 test/yomichan-test.js                              | 15 +++-----
 17 files changed, 114 insertions(+), 121 deletions(-)
 create mode 100644 test/data/dictionaries/valid-dictionary1/index.json
 create mode 100644 test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
 create mode 100644 test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json
 create mode 100644 test/data/dictionaries/valid-dictionary1/tag_bank_1.json
 create mode 100644 test/data/dictionaries/valid-dictionary1/tag_bank_2.json
 create mode 100644 test/data/dictionaries/valid-dictionary1/term_bank_1.json
 create mode 100644 test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
 delete mode 100644 test/test-dictionary-data/index.json
 delete mode 100644 test/test-dictionary-data/kanji_bank_1.json
 delete mode 100644 test/test-dictionary-data/kanji_meta_bank_1.json
 delete mode 100644 test/test-dictionary-data/tag_bank_1.json
 delete mode 100644 test/test-dictionary-data/tag_bank_2.json
 delete mode 100644 test/test-dictionary-data/term_bank_1.json
 delete mode 100644 test/test-dictionary-data/term_meta_bank_1.json

diff --git a/test/data/dictionaries/valid-dictionary1/index.json b/test/data/dictionaries/valid-dictionary1/index.json
new file mode 100644
index 00000000..3034bf38
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/index.json
@@ -0,0 +1,6 @@
+{
+    "title": "Test Dictionary",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
new file mode 100644
index 00000000..264f94c1
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
@@ -0,0 +1,42 @@
+[
+    [
+        "打",
+        "ダ ダアス",
+        "う.つ う.ち- ぶ.つ",
+        "ktag1 ktag2",
+        [
+            "meaning1",
+            "meaning2",
+            "meaning3",
+            "meaning4",
+            "meaning5"
+        ],
+        {
+            "kstat1": "1",
+            "kstat2": "2",
+            "kstat3": "3",
+            "kstat4": "4",
+            "kstat5": "5"
+        }
+    ],
+    [
+        "込",
+        "",
+        "-こ.む こ.む こ.み -こ.み こ.める",
+        "ktag1 ktag2",
+        [
+            "meaning1",
+            "meaning2",
+            "meaning3",
+            "meaning4",
+            "meaning5"
+        ],
+        {
+            "kstat1": "1",
+            "kstat2": "2",
+            "kstat3": "3",
+            "kstat4": "4",
+            "kstat5": "5"
+        }
+    ]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json
new file mode 100644
index 00000000..73e75b8a
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/kanji_meta_bank_1.json
@@ -0,0 +1,4 @@
+[
+    ["打", "freq", 1],
+    ["込", "freq", 2]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
new file mode 100644
index 00000000..109ad395
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
@@ -0,0 +1,7 @@
+[
+    ["tag1", "category1", 0, "tag1 notes", 0],
+    ["tag2", "category2", 0, "tag2 notes", 0],
+    ["tag3", "category3", 0, "tag3 notes", 0],
+    ["tag4", "category4", 0, "tag4 notes", 0],
+    ["tag5", "category5", 0, "tag5 notes", 0]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
new file mode 100644
index 00000000..5e7936b3
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
@@ -0,0 +1,9 @@
+[
+    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
+    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
+    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
+    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
+    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
+    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
+    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
new file mode 100644
index 00000000..755d9f6a
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
@@ -0,0 +1,34 @@
+[
+    ["打", "だ", "tag1 tag2", "", 2, ["definition1a (打, だ)", "definition1b (打, だ)"], 1, "tag3 tag4 tag5"],
+    ["打", "ダース", "tag1 tag2", "", 1, ["definition1a (打, ダース)", "definition1b (打, ダース)"], 2, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 3, ["definition1a (打つ, うつ)", "definition1b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 4, ["definition2a (打つ, うつ)", "definition2b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 5, ["definition3a (打つ, うつ)", "definition3b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 6, ["definition4a (打つ, うつ)", "definition4b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 7, ["definition5a (打つ, うつ)", "definition5b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 8, ["definition6a (打つ, うつ)", "definition6b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 9, ["definition7a (打つ, うつ)", "definition7b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition8a (打つ, うつ)", "definition8b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 11, ["definition9a (打つ, うつ)", "definition9b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 12, ["definition10a (打つ, うつ)", "definition10b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 13, ["definition11a (打つ, うつ)", "definition11b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 14, ["definition12a (打つ, うつ)", "definition12b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 15, ["definition13a (打つ, うつ)", "definition13b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 16, ["definition14a (打つ, うつ)", "definition14b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "うつ", "tag1 tag2", "v5", 17, ["definition15a (打つ, うつ)", "definition15b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
+    ["打つ", "ぶつ", "tag1 tag2", "v5", 18, ["definition1a (打つ, ぶつ)", "definition1b (打つ, ぶつ)"], 4, "tag3 tag4 tag5"],
+    ["打つ", "ぶつ", "tag1 tag2", "v5", 19, ["definition2a (打つ, ぶつ)", "definition2b (打つ, ぶつ)"], 4, "tag3 tag4 tag5"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 20, ["definition1a (打ち込む, うちこむ)", "definition1b (打ち込む, うちこむ)"], 5, "tag3 tag4 tag5"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 21, ["definition2a (打ち込む, うちこむ)", "definition2b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 22, ["definition3a (打ち込む, うちこむ)", "definition3b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 23, ["definition4a (打ち込む, うちこむ)", "definition4b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 24, ["definition5a (打ち込む, うちこむ)", "definition5b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 25, ["definition6a (打ち込む, うちこむ)", "definition6b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 26, ["definition7a (打ち込む, うちこむ)", "definition7b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 27, ["definition8a (打ち込む, うちこむ)", "definition8b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 28, ["definition9a (打ち込む, うちこむ)", "definition9b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 29, ["definition1a (打ち込む, ぶちこむ)", "definition1b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 30, ["definition2a (打ち込む, ぶちこむ)", "definition2b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 31, ["definition3a (打ち込む, ぶちこむ)", "definition3b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
+    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 32, ["definition4a (打ち込む, ぶちこむ)", "definition4b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
new file mode 100644
index 00000000..78096502
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
@@ -0,0 +1,5 @@
+[
+    ["打", "freq", 1],
+    ["打つ", "freq", 2],
+    ["打ち込む", "freq", 3]
+]
\ No newline at end of file
diff --git a/test/test-database.js b/test/test-database.js
index 801f9925..216ae5dd 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -121,7 +121,7 @@ async function clearDatabase() {
 
 async function testDatabase1() {
     // Load dictionary data
-    const testDictionary = yomichanTest.createTestDictionaryArchive();
+    const testDictionary = yomichanTest.createTestDictionaryArchive('valid-dictionary1');
     const testDictionarySource = await testDictionary.generateAsync({type: 'string'});
     const testDictionaryIndex = JSON.parse(await testDictionary.files['index.json'].async('string'));
 
@@ -800,7 +800,7 @@ async function testFindTagForTitle1(database, title) {
 
 async function testDatabase2() {
     // Load dictionary data
-    const testDictionary = yomichanTest.createTestDictionaryArchive();
+    const testDictionary = yomichanTest.createTestDictionaryArchive('valid-dictionary1');
     const testDictionarySource = await testDictionary.generateAsync({type: 'string'});
     const testDictionaryIndex = JSON.parse(await testDictionary.files['index.json'].async('string'));
 
diff --git a/test/test-dictionary-data/index.json b/test/test-dictionary-data/index.json
deleted file mode 100644
index 3034bf38..00000000
--- a/test/test-dictionary-data/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "title": "Test Dictionary",
-    "format": 3,
-    "revision": "test",
-    "sequenced": true
-}
\ No newline at end of file
diff --git a/test/test-dictionary-data/kanji_bank_1.json b/test/test-dictionary-data/kanji_bank_1.json
deleted file mode 100644
index 264f94c1..00000000
--- a/test/test-dictionary-data/kanji_bank_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    [
-        "打",
-        "ダ ダアス",
-        "う.つ う.ち- ぶ.つ",
-        "ktag1 ktag2",
-        [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
-        ],
-        {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
-        }
-    ],
-    [
-        "込",
-        "",
-        "-こ.む こ.む こ.み -こ.み こ.める",
-        "ktag1 ktag2",
-        [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
-        ],
-        {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
-        }
-    ]
-]
\ No newline at end of file
diff --git a/test/test-dictionary-data/kanji_meta_bank_1.json b/test/test-dictionary-data/kanji_meta_bank_1.json
deleted file mode 100644
index 73e75b8a..00000000
--- a/test/test-dictionary-data/kanji_meta_bank_1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    ["打", "freq", 1],
-    ["込", "freq", 2]
-]
\ No newline at end of file
diff --git a/test/test-dictionary-data/tag_bank_1.json b/test/test-dictionary-data/tag_bank_1.json
deleted file mode 100644
index 109ad395..00000000
--- a/test/test-dictionary-data/tag_bank_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-    ["tag1", "category1", 0, "tag1 notes", 0],
-    ["tag2", "category2", 0, "tag2 notes", 0],
-    ["tag3", "category3", 0, "tag3 notes", 0],
-    ["tag4", "category4", 0, "tag4 notes", 0],
-    ["tag5", "category5", 0, "tag5 notes", 0]
-]
\ No newline at end of file
diff --git a/test/test-dictionary-data/tag_bank_2.json b/test/test-dictionary-data/tag_bank_2.json
deleted file mode 100644
index 5e7936b3..00000000
--- a/test/test-dictionary-data/tag_bank_2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
-    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
-    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
-    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
-    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
-    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
-    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
-]
\ No newline at end of file
diff --git a/test/test-dictionary-data/term_bank_1.json b/test/test-dictionary-data/term_bank_1.json
deleted file mode 100644
index 755d9f6a..00000000
--- a/test/test-dictionary-data/term_bank_1.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    ["打", "だ", "tag1 tag2", "", 2, ["definition1a (打, だ)", "definition1b (打, だ)"], 1, "tag3 tag4 tag5"],
-    ["打", "ダース", "tag1 tag2", "", 1, ["definition1a (打, ダース)", "definition1b (打, ダース)"], 2, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 3, ["definition1a (打つ, うつ)", "definition1b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 4, ["definition2a (打つ, うつ)", "definition2b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 5, ["definition3a (打つ, うつ)", "definition3b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 6, ["definition4a (打つ, うつ)", "definition4b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 7, ["definition5a (打つ, うつ)", "definition5b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 8, ["definition6a (打つ, うつ)", "definition6b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 9, ["definition7a (打つ, うつ)", "definition7b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition8a (打つ, うつ)", "definition8b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 11, ["definition9a (打つ, うつ)", "definition9b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 12, ["definition10a (打つ, うつ)", "definition10b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 13, ["definition11a (打つ, うつ)", "definition11b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 14, ["definition12a (打つ, うつ)", "definition12b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 15, ["definition13a (打つ, うつ)", "definition13b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 16, ["definition14a (打つ, うつ)", "definition14b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 17, ["definition15a (打つ, うつ)", "definition15b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 18, ["definition1a (打つ, ぶつ)", "definition1b (打つ, ぶつ)"], 4, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 19, ["definition2a (打つ, ぶつ)", "definition2b (打つ, ぶつ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 20, ["definition1a (打ち込む, うちこむ)", "definition1b (打ち込む, うちこむ)"], 5, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 21, ["definition2a (打ち込む, うちこむ)", "definition2b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 22, ["definition3a (打ち込む, うちこむ)", "definition3b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 23, ["definition4a (打ち込む, うちこむ)", "definition4b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 24, ["definition5a (打ち込む, うちこむ)", "definition5b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 25, ["definition6a (打ち込む, うちこむ)", "definition6b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 26, ["definition7a (打ち込む, うちこむ)", "definition7b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 27, ["definition8a (打ち込む, うちこむ)", "definition8b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 28, ["definition9a (打ち込む, うちこむ)", "definition9b (打ち込む, うちこむ)"], 5, "tag5 tag6 tag7"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 29, ["definition1a (打ち込む, ぶちこむ)", "definition1b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 30, ["definition2a (打ち込む, ぶちこむ)", "definition2b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 31, ["definition3a (打ち込む, ぶちこむ)", "definition3b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 32, ["definition4a (打ち込む, ぶちこむ)", "definition4b (打ち込む, ぶちこむ)"], 6, "tag3 tag4 tag5"]
-]
\ No newline at end of file
diff --git a/test/test-dictionary-data/term_meta_bank_1.json b/test/test-dictionary-data/term_meta_bank_1.json
deleted file mode 100644
index 78096502..00000000
--- a/test/test-dictionary-data/term_meta_bank_1.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-    ["打", "freq", 1],
-    ["打つ", "freq", 2],
-    ["打ち込む", "freq", 3]
-]
\ No newline at end of file
diff --git a/test/test-dictionary.js b/test/test-dictionary.js
index 84014540..b9885edc 100644
--- a/test/test-dictionary.js
+++ b/test/test-dictionary.js
@@ -3,7 +3,7 @@ const dictionaryValidate = require('./dictionary-validate');
 
 
 async function main() {
-    const archive = yomichanTest.createTestDictionaryArchive();
+    const archive = yomichanTest.createTestDictionaryArchive('valid-dictionary1');
     const schemas = dictionaryValidate.getSchemas();
     await dictionaryValidate.validateDictionary(archive, schemas);
 }
diff --git a/test/yomichan-test.js b/test/yomichan-test.js
index dd4da919..939e0ad2 100644
--- a/test/yomichan-test.js
+++ b/test/yomichan-test.js
@@ -26,21 +26,14 @@ function getJSZip() {
     return JSZip;
 }
 
-function createTestDictionaryArchive(dictionaryName) {
-    const fileNames = [
-        'index.json',
-        'tag_bank_1.json',
-        'tag_bank_2.json',
-        'term_bank_1.json',
-        'kanji_bank_1.json',
-        'term_meta_bank_1.json',
-        'kanji_meta_bank_1.json'
-    ];
+function createTestDictionaryArchive(dictionary, dictionaryName) {
+    const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', dictionary);
+    const fileNames = fs.readdirSync(dictionaryDirectory);
 
     const archive = new (getJSZip())();
 
     for (const fileName of fileNames) {
-        const source = fs.readFileSync(path.join(__dirname, 'test-dictionary-data', fileName), {encoding: 'utf8'});
+        const source = fs.readFileSync(path.join(dictionaryDirectory, fileName), {encoding: 'utf8'});
         const json = JSON.parse(source);
         if (fileName === 'index.json' && typeof dictionaryName === 'string') {
             json.title = dictionaryName;
-- 
cgit v1.2.3


From 7b1a1480dc440eb1c7b1a6170ac0964bc4c7a3fa Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 13:09:18 -0500
Subject: Add a timeout to clearDatabase

This will trigger in case something goes wrong and a database isn't closed.
---
 test/test-database.js | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/test/test-database.js b/test/test-database.js
index 216ae5dd..6fe515e6 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -107,15 +107,25 @@ function countKanjiWithCharacter(kanji, character) {
 }
 
 
-async function clearDatabase() {
-    const indexedDB = global.indexedDB;
-    for (const {name} of await indexedDB.databases()) {
-        await new Promise((resolve, reject) => {
-            const request = indexedDB.deleteDatabase(name);
-            request.onerror = (e) => reject(e);
-            request.onsuccess = () => resolve();
-        });
-    }
+function clearDatabase(timeout) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            reject(new Error(`clearDatabase failed to resolve after ${timeout}ms`));
+        }, timeout);
+
+        (async () => {
+            const indexedDB = global.indexedDB;
+            for (const {name} of await indexedDB.databases()) {
+                await new Promise((resolve, reject) => {
+                    const request = indexedDB.deleteDatabase(name);
+                    request.onerror = (e) => reject(e);
+                    request.onsuccess = () => resolve();
+                });
+            }
+            clearTimeout(timer);
+            resolve();
+        })();
+    });
 }
 
 
@@ -840,11 +850,18 @@ async function testDatabase2() {
 
 
 async function main() {
-    await testDatabase1();
-    await clearDatabase();
-
-    await testDatabase2();
-    await clearDatabase();
+    const clearTimeout = 5000;
+    try {
+        await testDatabase1();
+        await clearDatabase(clearTimeout);
+
+        await testDatabase2();
+        await clearDatabase(clearTimeout);
+    } catch (e) {
+        console.log(e);
+        process.exit(-1);
+        throw e;
+    }
 }
 
 
-- 
cgit v1.2.3


From 77a3dadd0b128f4421e16c3465fbf609c483241b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 13:25:28 -0500
Subject: Make schema errors have more information

---
 ext/bg/js/database.js | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index a5919868..453cf15f 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -326,7 +326,8 @@ class Database {
         const archive = await JSZip.loadAsync(archiveSource);
 
         // Read and validate index
-        const indexFile = archive.files['index.json'];
+        const indexFileName = 'index.json';
+        const indexFile = archive.files[indexFileName];
         if (!indexFile) {
             throw new Error('No dictionary index found in archive');
         }
@@ -334,7 +335,7 @@ class Database {
         const index = JSON.parse(await indexFile.async('string'));
 
         const indexSchema = await this._getSchema('/bg/data/dictionary-index-schema.json');
-        JsonSchema.validate(index, indexSchema);
+        Database._validateJsonSchema(index, indexSchema, indexFileName);
 
         const dictionaryTitle = index.title;
         const version = index.format || index.version;
@@ -393,7 +394,7 @@ class Database {
                 if (!file) { break; }
 
                 const entries = JSON.parse(await file.async('string'));
-                JsonSchema.validate(entries, schema);
+                Database._validateJsonSchema(entries, schema, fileName);
 
                 for (let entry of entries) {
                     entry = convertEntry(entry);
@@ -508,6 +509,42 @@ class Database {
         return schemaPromise;
     }
 
+    static _validateJsonSchema(value, schema, fileName) {
+        try {
+            JsonSchema.validate(value, schema);
+        } catch (e) {
+            throw Database._formatSchemaError(e, fileName);
+        }
+    }
+
+    static _formatSchemaError(e, fileName) {
+        const valuePathString = Database._getSchemaErrorPathString(e.info.valuePath, 'dictionary');
+        const schemaPathString = Database._getSchemaErrorPathString(e.info.schemaPath, 'schema');
+
+        const e2 = new Error(`Dictionary has invalid data in '${fileName}' for value '${valuePathString}', validated against '${schemaPathString}': ${e.message}`);
+        e2.data = e;
+
+        return e2;
+    }
+
+    static _getSchemaErrorPathString(infoList, base='') {
+        let result = base;
+        for (const [part] of infoList) {
+            switch (typeof part) {
+                case 'string':
+                    if (result.length > 0) {
+                        result += '.';
+                    }
+                    result += part;
+                    break;
+                case 'number':
+                    result += `[${part}]`;
+                    break;
+            }
+        }
+        return result;
+    }
+
     static _getDataBankSchemaPaths(version) {
         const termBank = (
             version === 1 ?
-- 
cgit v1.2.3


From 12e0923b63492c8ba5ca949d5ce0f3ad8aeb01d0 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 13:38:03 -0500
Subject: Add some basic invalid dictionaries to test

---
 .../dictionaries/invalid-dictionary1/index.json    |  7 ++++
 .../dictionaries/invalid-dictionary2/index.json    |  7 ++++
 .../invalid-dictionary2/kanji_bank_1.json          |  3 ++
 .../dictionaries/invalid-dictionary3/index.json    |  7 ++++
 .../invalid-dictionary3/kanji_meta_bank_1.json     |  1 +
 .../dictionaries/invalid-dictionary4/index.json    |  7 ++++
 .../invalid-dictionary4/tag_bank_1.json            |  3 ++
 .../dictionaries/invalid-dictionary5/index.json    |  7 ++++
 .../invalid-dictionary5/term_bank_1.json           |  3 ++
 .../dictionaries/invalid-dictionary6/index.json    |  7 ++++
 .../invalid-dictionary6/term_meta_bank_1.json      |  1 +
 test/test-database.js                              | 42 ++++++++++++++++++++++
 12 files changed, 95 insertions(+)
 create mode 100644 test/data/dictionaries/invalid-dictionary1/index.json
 create mode 100644 test/data/dictionaries/invalid-dictionary2/index.json
 create mode 100644 test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json
 create mode 100644 test/data/dictionaries/invalid-dictionary3/index.json
 create mode 100644 test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json
 create mode 100644 test/data/dictionaries/invalid-dictionary4/index.json
 create mode 100644 test/data/dictionaries/invalid-dictionary4/tag_bank_1.json
 create mode 100644 test/data/dictionaries/invalid-dictionary5/index.json
 create mode 100644 test/data/dictionaries/invalid-dictionary5/term_bank_1.json
 create mode 100644 test/data/dictionaries/invalid-dictionary6/index.json
 create mode 100644 test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json

diff --git a/test/data/dictionaries/invalid-dictionary1/index.json b/test/data/dictionaries/invalid-dictionary1/index.json
new file mode 100644
index 00000000..1be3b360
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary1/index.json
@@ -0,0 +1,7 @@
+{
+    "title": "Invalid Dictionary 1",
+    "format": 0,
+    "revision": "test",
+    "sequenced": true,
+    "description": "Invalid format number"
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary2/index.json b/test/data/dictionaries/invalid-dictionary2/index.json
new file mode 100644
index 00000000..ba2cc669
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary2/index.json
@@ -0,0 +1,7 @@
+{
+    "title": "Invalid Dictionary 2",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true,
+    "description": "Empty entry in kanji bank"
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json b/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json
new file mode 100644
index 00000000..5825bcac
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary2/kanji_bank_1.json
@@ -0,0 +1,3 @@
+[
+    []
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary3/index.json b/test/data/dictionaries/invalid-dictionary3/index.json
new file mode 100644
index 00000000..f23fa3f0
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary3/index.json
@@ -0,0 +1,7 @@
+{
+    "title": "Invalid Dictionary 3",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true,
+    "description": "Invalid type entry in kanji meta bank"
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json b/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary3/kanji_meta_bank_1.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary4/index.json b/test/data/dictionaries/invalid-dictionary4/index.json
new file mode 100644
index 00000000..542791d7
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary4/index.json
@@ -0,0 +1,7 @@
+{
+    "title": "Invalid Dictionary 4",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true,
+    "description": "Invalid value as part of a tag bank entry"
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json b/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json
new file mode 100644
index 00000000..4f19b476
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary4/tag_bank_1.json
@@ -0,0 +1,3 @@
+[
+    [{"invalid": true}, "category1", 0, "tag1 notes", 0]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary5/index.json b/test/data/dictionaries/invalid-dictionary5/index.json
new file mode 100644
index 00000000..e0d0f00e
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary5/index.json
@@ -0,0 +1,7 @@
+{
+    "title": "Invalid Dictionary 5",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true,
+    "description": "Invalid type as part of a term bank entry"
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary5/term_bank_1.json b/test/data/dictionaries/invalid-dictionary5/term_bank_1.json
new file mode 100644
index 00000000..7288a996
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary5/term_bank_1.json
@@ -0,0 +1,3 @@
+[
+    ["打", "だ", "tag1 tag2", "", 2, false, 1, "tag3 tag4 tag5"]
+]
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary6/index.json b/test/data/dictionaries/invalid-dictionary6/index.json
new file mode 100644
index 00000000..b91acca3
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary6/index.json
@@ -0,0 +1,7 @@
+{
+    "title": "Invalid Dictionary 6",
+    "format": 3,
+    "revision": "test",
+    "sequenced": true,
+    "description": "Invalid root type for term meta bank"
+}
\ No newline at end of file
diff --git a/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json b/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json
new file mode 100644
index 00000000..02e4a84d
--- /dev/null
+++ b/test/data/dictionaries/invalid-dictionary6/term_meta_bank_1.json
@@ -0,0 +1 @@
+false
\ No newline at end of file
diff --git a/test/test-database.js b/test/test-database.js
index 6fe515e6..4fb3805d 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -849,6 +849,45 @@ async function testDatabase2() {
 }
 
 
+async function testDatabase3() {
+    const invalidDictionaries = [
+        'invalid-dictionary1',
+        'invalid-dictionary2',
+        'invalid-dictionary3',
+        'invalid-dictionary4',
+        'invalid-dictionary5',
+        'invalid-dictionary6'
+    ];
+
+    // Setup database
+    const database = new Database();
+    await database.prepare();
+
+    for (const invalidDictionary of invalidDictionaries) {
+        const testDictionary = yomichanTest.createTestDictionaryArchive(invalidDictionary);
+        const testDictionarySource = await testDictionary.generateAsync({type: 'string'});
+
+        let error = null;
+        try {
+            await database.importDictionary(testDictionarySource, () => {}, {});
+        } catch (e) {
+            error = e;
+        }
+
+        if (error === null) {
+            assert.ok(false, `Expected an error while importing ${invalidDictionary}`);
+        } else {
+            const prefix = 'Dictionary has invalid data';
+            const message = error.message;
+            assert.ok(typeof message, 'string');
+            assert.ok(message.startsWith(prefix), `Expected error message to start with '${prefix}': ${message}`);
+        }
+    }
+
+    await database.close();
+}
+
+
 async function main() {
     const clearTimeout = 5000;
     try {
@@ -857,6 +896,9 @@ async function main() {
 
         await testDatabase2();
         await clearDatabase(clearTimeout);
+
+        await testDatabase3();
+        await clearDatabase(clearTimeout);
     } catch (e) {
         console.log(e);
         process.exit(-1);
-- 
cgit v1.2.3


From a2b72dd3ab4a560d4549aa52912fcb9cd9f275ab Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 13:40:57 -0500
Subject: Update test-dictionary

---
 test/test-dictionary.js | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/test/test-dictionary.js b/test/test-dictionary.js
index b9885edc..b157dd5d 100644
--- a/test/test-dictionary.js
+++ b/test/test-dictionary.js
@@ -3,9 +3,38 @@ const dictionaryValidate = require('./dictionary-validate');
 
 
 async function main() {
-    const archive = yomichanTest.createTestDictionaryArchive('valid-dictionary1');
+    const dictionaries = [
+        {name: 'valid-dictionary1', valid: true},
+        {name: 'invalid-dictionary1', valid: false},
+        {name: 'invalid-dictionary2', valid: false},
+        {name: 'invalid-dictionary3', valid: false},
+        {name: 'invalid-dictionary4', valid: false},
+        {name: 'invalid-dictionary5', valid: false},
+        {name: 'invalid-dictionary6', valid: false}
+    ];
+
     const schemas = dictionaryValidate.getSchemas();
-    await dictionaryValidate.validateDictionary(archive, schemas);
+
+    for (const {name, valid} of dictionaries) {
+        const archive = yomichanTest.createTestDictionaryArchive(name);
+
+        let error = null;
+        try {
+            await dictionaryValidate.validateDictionary(archive, schemas);
+        } catch (e) {
+            error = e;
+        }
+
+        if (valid) {
+            if (error !== null) {
+                throw error;
+            }
+        } else {
+            if (error === null) {
+                throw new Error(`Expected dictionary ${name} to be invalid`);
+            }
+        }
+    }
 }
 
 
-- 
cgit v1.2.3


From 452eec8a881f0fcbdb2d5c75ae8253b158812d10 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:27:18 -0500
Subject: Use Map

---
 ext/bg/js/settings/dictionaries.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index adad76fb..427f47f0 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -491,15 +491,18 @@ function dictionaryErrorsShow(errors) {
     dialog.textContent = '';
 
     if (errors !== null && errors.length > 0) {
-        const uniqueErrors = {};
+        const uniqueErrors = new Map();
         for (let e of errors) {
             console.error(e);
             e = dictionaryErrorToString(e);
-            uniqueErrors[e] = hasOwn(uniqueErrors, e) ? uniqueErrors[e] + 1 : 1;
+            let count = uniqueErrors.get(e);
+            if (typeof count === 'undefined') {
+                count = 0;
+            }
+            uniqueErrors.set(e, count + 1);
         }
 
-        for (const e in uniqueErrors) {
-            const count = uniqueErrors[e];
+        for (const [e, count] of uniqueErrors.entries()) {
             const div = document.createElement('p');
             if (count > 1) {
                 div.textContent = `${e} `;
-- 
cgit v1.2.3


From 886278b19de3693f75bb6c7775da8db86a8dd008 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:30:07 -0500
Subject: Use Set

---
 ext/bg/js/translator.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 3471cb01..b850c6e4 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -400,16 +400,12 @@ class Translator {
     async findKanji(text, options) {
         const dictionaries = dictEnabledSet(options);
         const titles = Object.keys(dictionaries);
-        const kanjiUnique = {};
-        const kanjiList = [];
+        const kanjiUnique = new Set();
         for (const c of text) {
-            if (!hasOwn(kanjiUnique, c)) {
-                kanjiList.push(c);
-                kanjiUnique[c] = true;
-            }
+            kanjiUnique.add(c);
         }
 
-        const definitions = await this.database.findKanjiBulk(kanjiList, titles);
+        const definitions = await this.database.findKanjiBulk([...kanjiUnique], titles);
         if (definitions.length === 0) {
             return definitions;
         }
-- 
cgit v1.2.3


From 1f62dfa572f2eff2a130ef5db7b12bdc2dc7db27 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:31:11 -0500
Subject: Use Set

---
 ext/bg/js/database.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 453cf15f..db59f982 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -153,11 +153,11 @@ class Database {
         this._validate();
 
         const promises = [];
-        const visited = {};
+        const visited = new Set();
         const results = [];
         const processRow = (row, index) => {
-            if (titles.includes(row.dictionary) && !hasOwn(visited, row.id)) {
-                visited[row.id] = true;
+            if (titles.includes(row.dictionary) && !visited.has(row.id)) {
+                visited.add(row.id);
                 results.push(Database._createTerm(row, index));
             }
         };
-- 
cgit v1.2.3


From cae8ed276799f0171aa8a5d77b908b4a751c98e9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:32:45 -0500
Subject: Use Array.isArray instead of hasOwn

---
 ext/bg/js/audio.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js
index 6389528b..0ecfd5c4 100644
--- a/ext/bg/js/audio.js
+++ b/ext/bg/js/audio.js
@@ -168,10 +168,8 @@ async function audioInject(definition, fields, sources, optionsContext) {
     }
 
     try {
-        let audioSourceDefinition = definition;
-        if (hasOwn(definition, 'expressions')) {
-            audioSourceDefinition = definition.expressions[0];
-        }
+        const expressions = definition.expressions;
+        const audioSourceDefinition = Array.isArray(expressions) ? expressions[0] : definition;
 
         const {url} = await audioGetFromSources(audioSourceDefinition, sources, optionsContext, true);
         if (url !== null) {
-- 
cgit v1.2.3


From bc94970a46171c2cd0f5feb272811487e2e1e110 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:45:18 -0500
Subject: Use Map

---
 ext/bg/js/dictionary.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 491632a0..afdd71a0 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -123,7 +123,7 @@ function dictTermsCompressTags(definitions) {
 }
 
 function dictTermsGroup(definitions, dictionaries) {
-    const groups = {};
+    const groups = new Map();
     for (const definition of definitions) {
         const key = [definition.source, definition.expression];
         key.push(...definition.reasons);
@@ -132,26 +132,27 @@ function dictTermsGroup(definitions, dictionaries) {
         }
 
         const keyString = key.toString();
-        if (hasOwn(groups, keyString)) {
-            groups[keyString].push(definition);
-        } else {
-            groups[keyString] = [definition];
+        let groupDefinitions = groups.get(keyString);
+        if (typeof groupDefinitions === 'undefined') {
+            groupDefinitions = [];
+            groups.set(keyString, groupDefinitions);
         }
+
+        groupDefinitions.push(definition);
     }
 
     const results = [];
-    for (const key in groups) {
-        const groupDefs = groups[key];
-        const firstDef = groupDefs[0];
-        dictTermsSort(groupDefs, dictionaries);
+    for (const groupDefinitions of groups.values()) {
+        const firstDef = groupDefinitions[0];
+        dictTermsSort(groupDefinitions, dictionaries);
         results.push({
-            definitions: groupDefs,
+            definitions: groupDefinitions,
             expression: firstDef.expression,
             reading: firstDef.reading,
             furiganaSegments: firstDef.furiganaSegments,
             reasons: firstDef.reasons,
             termTags: firstDef.termTags,
-            score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
+            score: groupDefinitions.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
             source: firstDef.source
         });
     }
-- 
cgit v1.2.3


From 5587116baef8e243412eb9e5ad9690284944a7a3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:55:21 -0500
Subject: Simplify spread

---
 ext/bg/js/dictionary.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index afdd71a0..52302e9b 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -125,8 +125,7 @@ function dictTermsCompressTags(definitions) {
 function dictTermsGroup(definitions, dictionaries) {
     const groups = new Map();
     for (const definition of definitions) {
-        const key = [definition.source, definition.expression];
-        key.push(...definition.reasons);
+        const key = [definition.source, definition.expression, ...definition.reasons];
         if (definition.reading) {
             key.push(definition.reading);
         }
-- 
cgit v1.2.3


From a4bdffbd9def55cdc8a8a5058be39d9eea42b5e9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:55:35 -0500
Subject: Use Map

---
 ext/bg/js/dictionary.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 52302e9b..febb27cc 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -79,20 +79,16 @@ function dictTermsSort(definitions, dictionaries=null) {
 }
 
 function dictTermsUndupe(definitions) {
-    const definitionGroups = {};
+    const definitionGroups = new Map();
     for (const definition of definitions) {
-        const definitionExisting = definitionGroups[definition.id];
-        if (!hasOwn(definitionGroups, definition.id) || definition.expression.length > definitionExisting.expression.length) {
-            definitionGroups[definition.id] = definition;
+        const id = definition.id;
+        const definitionExisting = definitionGroups.get(id);
+        if (typeof definitionExisting === 'undefined' || definition.expression.length > definitionExisting.expression.length) {
+            definitionGroups.set(id, definition);
         }
     }
 
-    const definitionsUnique = [];
-    for (const key in definitionGroups) {
-        definitionsUnique.push(definitionGroups[key]);
-    }
-
-    return definitionsUnique;
+    return [...definitionGroups.values()];
 }
 
 function dictTermsCompressTags(definitions) {
-- 
cgit v1.2.3


From 163211ade323f09ad9de7861e1eeab8d344bacb8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 13:12:03 -0500
Subject: Use Map

---
 ext/bg/js/translator.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index b850c6e4..a864712a 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -506,28 +506,29 @@ class Translator {
         const names = Object.keys(items);
         const tagMetaList = await this.getTagMetaList(names, title);
 
-        const stats = {};
+        const statsGroups = new Map();
         for (let i = 0; i < names.length; ++i) {
             const name = names[i];
             const meta = tagMetaList[i];
             if (meta === null) { continue; }
 
             const category = meta.category;
-            const group = (
-                hasOwn(stats, category) ?
-                stats[category] :
-                (stats[category] = [])
-            );
+            let group = statsGroups.get(category);
+            if (typeof group === 'undefined') {
+                group = [];
+                statsGroups.set(category, group);
+            }
 
             const stat = Object.assign({}, meta, {name, value: items[name]});
             group.push(dictTagSanitize(stat));
         }
 
+        const stats = {};
         const sortCompare = (a, b) => a.notes - b.notes;
-        for (const category in stats) {
-            stats[category].sort(sortCompare);
+        for (const [category, group] of statsGroups.entries()) {
+            group.sort(sortCompare);
+            stats[category] = group;
         }
-
         return stats;
     }
 
-- 
cgit v1.2.3


From 7afc23427e61d7a36a1a700c45a42f7ee5fde0c8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 13:36:32 -0500
Subject: Use URLSearchParams

---
 ext/mixed/js/audio.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
index 47db5c75..fe5982dd 100644
--- a/ext/mixed/js/audio.js
+++ b/ext/mixed/js/audio.js
@@ -72,19 +72,15 @@ class TextToSpeechAudio {
         const m = /^tts:[^#?]*\?([^#]*)/.exec(ttsUri);
         if (m === null) { return null; }
 
-        const searchParameters = {};
-        for (const group of m[1].split('&')) {
-            const sep = group.indexOf('=');
-            if (sep < 0) { continue; }
-            searchParameters[decodeURIComponent(group.substring(0, sep))] = decodeURIComponent(group.substring(sep + 1));
-        }
-
-        if (!searchParameters.text) { return null; }
+        const searchParameters = new URLSearchParams(m[1]);
+        const text = searchParameters.get('text');
+        let voice = searchParameters.get('voice');
+        if (text === null || voice === null) { return null; }
 
-        const voice = audioGetTextToSpeechVoice(searchParameters.voice);
+        voice = audioGetTextToSpeechVoice(voice);
         if (voice === null) { return null; }
 
-        return new TextToSpeechAudio(searchParameters.text, voice);
+        return new TextToSpeechAudio(text, voice);
     }
 
 }
-- 
cgit v1.2.3


From b0c566417ff15a7b9b71b7a1e019025a84842d2c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 13:46:21 -0500
Subject: Replace getIndexOfTouch with getTouch

---
 ext/mixed/js/text-scanner.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index aa10bbaf..db3835cf 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -158,7 +158,7 @@ class TextScanner {
     onTouchEnd(e) {
         if (
             this.primaryTouchIdentifier === null ||
-            TextScanner.getIndexOfTouch(e.changedTouches, this.primaryTouchIdentifier) < 0
+            TextScanner.getTouch(e.changedTouches, this.primaryTouchIdentifier) === null
         ) {
             return;
         }
@@ -181,13 +181,11 @@ class TextScanner {
             return;
         }
 
-        const touches = e.changedTouches;
-        const index = TextScanner.getIndexOfTouch(touches, this.primaryTouchIdentifier);
-        if (index < 0) {
+        const primaryTouch = TextScanner.getTouch(e.changedTouches, this.primaryTouchIdentifier);
+        if (primaryTouch === null) {
             return;
         }
 
-        const primaryTouch = touches[index];
         this.searchAt(primaryTouch.clientX, primaryTouch.clientY, 'touchMove');
 
         e.preventDefault(); // Disable scroll
@@ -356,13 +354,12 @@ class TextScanner {
         }
     }
 
-    static getIndexOfTouch(touchList, identifier) {
-        for (const i in touchList) {
-            const t = touchList[i];
-            if (t.identifier === identifier) {
-                return i;
+    static getTouch(touchList, identifier) {
+        for (const touch of touchList) {
+            if (touch.identifier === identifier) {
+                return touch;
             }
         }
-        return -1;
+        return null;
     }
 }
-- 
cgit v1.2.3


From cc2e21cd866fd02120c593f6a5ad9b5840c0edbb Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:01:21 -0500
Subject: Use Map for dictEnabledSet

---
 ext/bg/js/database.js   | 24 ++++++++++++------------
 ext/bg/js/dictionary.js | 27 +++++++++++++++------------
 ext/bg/js/translator.js | 37 ++++++++++++++++---------------------
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index db59f982..1f6810cf 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -149,14 +149,14 @@ class Database {
         await Promise.all(promises);
     }
 
-    async findTermsBulk(termList, titles, wildcard) {
+    async findTermsBulk(termList, dictionaries, wildcard) {
         this._validate();
 
         const promises = [];
         const visited = new Set();
         const results = [];
         const processRow = (row, index) => {
-            if (titles.includes(row.dictionary) && !visited.has(row.id)) {
+            if (dictionaries.has(row.dictionary) && !visited.has(row.id)) {
                 visited.add(row.id);
                 results.push(Database._createTerm(row, index));
             }
@@ -184,13 +184,13 @@ class Database {
         return results;
     }
 
-    async findTermsExactBulk(termList, readingList, titles) {
+    async findTermsExactBulk(termList, readingList, dictionaries) {
         this._validate();
 
         const promises = [];
         const results = [];
         const processRow = (row, index) => {
-            if (row.reading === readingList[index] && titles.includes(row.dictionary)) {
+            if (row.reading === readingList[index] && dictionaries.has(row.dictionary)) {
                 results.push(Database._createTerm(row, index));
             }
         };
@@ -234,16 +234,16 @@ class Database {
         return results;
     }
 
-    async findTermMetaBulk(termList, titles) {
-        return this._findGenericBulk('termMeta', 'expression', termList, titles, Database._createTermMeta);
+    async findTermMetaBulk(termList, dictionaries) {
+        return this._findGenericBulk('termMeta', 'expression', termList, dictionaries, Database._createTermMeta);
     }
 
-    async findKanjiBulk(kanjiList, titles) {
-        return this._findGenericBulk('kanji', 'character', kanjiList, titles, Database._createKanji);
+    async findKanjiBulk(kanjiList, dictionaries) {
+        return this._findGenericBulk('kanji', 'character', kanjiList, dictionaries, Database._createKanji);
     }
 
-    async findKanjiMetaBulk(kanjiList, titles) {
-        return this._findGenericBulk('kanjiMeta', 'character', kanjiList, titles, Database._createKanjiMeta);
+    async findKanjiMetaBulk(kanjiList, dictionaries) {
+        return this._findGenericBulk('kanjiMeta', 'character', kanjiList, dictionaries, Database._createKanjiMeta);
     }
 
     async findTagForTitle(name, title) {
@@ -572,13 +572,13 @@ class Database {
         return count > 0;
     }
 
-    async _findGenericBulk(tableName, indexName, indexValueList, titles, createResult) {
+    async _findGenericBulk(tableName, indexName, indexValueList, dictionaries, createResult) {
         this._validate();
 
         const promises = [];
         const results = [];
         const processRow = (row, index) => {
-            if (titles.includes(row.dictionary)) {
+            if (dictionaries.has(row.dictionary)) {
                 results.push(createResult(row, index));
             }
         };
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index febb27cc..d9a7a865 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -19,15 +19,17 @@
 /*global utilSetEqual, utilSetIntersection, apiTemplateRender*/
 
 function dictEnabledSet(options) {
-    const dictionaries = {};
-    for (const title in options.dictionaries) {
-        const dictionary = options.dictionaries[title];
-        if (dictionary.enabled) {
-            dictionaries[title] = dictionary;
-        }
+    const enabledDictionaryMap = new Map();
+    const optionsDictionaries = options.dictionaries;
+    for (const title in optionsDictionaries) {
+        if (!hasOwn(optionsDictionaries, title)) { continue; }
+        const dictionary = optionsDictionaries[title];
+        if (!dictionary.enabled) { continue; }
+        enabledDictionaryMap.set(title, {
+            priority: dictionary.priority || 0
+        });
     }
-
-    return dictionaries;
+    return enabledDictionaryMap;
 }
 
 function dictConfigured(options) {
@@ -58,10 +60,11 @@ function dictTermsSort(definitions, dictionaries=null) {
     return definitions.sort((v1, v2) => {
         let i;
         if (dictionaries !== null) {
-            i = (
-                ((dictionaries[v2.dictionary] || {}).priority || 0) -
-                ((dictionaries[v1.dictionary] || {}).priority || 0)
-            );
+            const dictionaryInfo1 = dictionaries.get(v1.dictionary);
+            const dictionaryInfo2 = dictionaries.get(v2.dictionary);
+            const priority1 = typeof dictionaryInfo1 !== 'undefined' ? dictionaryInfo1.priority || 0 : 0;
+            const priority2 = typeof dictionaryInfo2 !== 'undefined' ? dictionaryInfo2.priority || 0 : 0;
+            i = priority2 - priority1;
             if (i !== 0) { return i; }
         }
 
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index a864712a..c7017328 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -85,7 +85,7 @@ class Translator {
             }
         }
 
-        const definitions = await this.database.findTermsExactBulk(expressionList, readingList, secondarySearchTitles);
+        const definitions = await this.database.findTermsExactBulk(expressionList, readingList, new Set(secondarySearchTitles));
         for (const definition of definitions) {
             const definitionTags = await this.expandTags(definition.definitionTags, definition.dictionary);
             definitionTags.push(dictTagBuildSource(definition.dictionary));
@@ -156,11 +156,10 @@ class Translator {
 
     async findTermsGrouped(text, details, options) {
         const dictionaries = dictEnabledSet(options);
-        const titles = Object.keys(dictionaries);
         const [definitions, length] = await this.findTermsInternal(text, dictionaries, details, options);
 
         const definitionsGrouped = dictTermsGroup(definitions, dictionaries);
-        await this.buildTermMeta(definitionsGrouped, titles);
+        await this.buildTermMeta(definitionsGrouped, dictionaries);
 
         if (options.general.compactTags) {
             for (const definition of definitionsGrouped) {
@@ -174,7 +173,6 @@ class Translator {
     async findTermsMerged(text, details, options) {
         const dictionaries = dictEnabledSet(options);
         const secondarySearchTitles = Object.keys(options.dictionaries).filter((dict) => options.dictionaries[dict].allowSecondarySearches);
-        const titles = Object.keys(dictionaries);
         const [definitions, length] = await this.findTermsInternal(text, dictionaries, details, options);
         const {sequencedDefinitions, defaultDefinitions} = await this.getSequencedDefinitions(definitions, options.general.mainDictionary);
         const definitionsMerged = [];
@@ -198,7 +196,7 @@ class Translator {
             definitionsMerged.push(groupedDefinition);
         }
 
-        await this.buildTermMeta(definitionsMerged, titles);
+        await this.buildTermMeta(definitionsMerged, dictionaries);
 
         if (options.general.compactTags) {
             for (const definition of definitionsMerged) {
@@ -211,10 +209,9 @@ class Translator {
 
     async findTermsSplit(text, details, options) {
         const dictionaries = dictEnabledSet(options);
-        const titles = Object.keys(dictionaries);
         const [definitions, length] = await this.findTermsInternal(text, dictionaries, details, options);
 
-        await this.buildTermMeta(definitions, titles);
+        await this.buildTermMeta(definitions, dictionaries);
 
         return [definitions, length];
     }
@@ -225,11 +222,10 @@ class Translator {
             return [[], 0];
         }
 
-        const titles = Object.keys(dictionaries);
         const deinflections = (
             details.wildcard ?
-            await this.findTermWildcard(text, titles, details.wildcard) :
-            await this.findTermDeinflections(text, titles, options)
+            await this.findTermWildcard(text, dictionaries, details.wildcard) :
+            await this.findTermDeinflections(text, dictionaries, options)
         );
 
         let definitions = [];
@@ -271,8 +267,8 @@ class Translator {
         return [definitions, length];
     }
 
-    async findTermWildcard(text, titles, wildcard) {
-        const definitions = await this.database.findTermsBulk([text], titles, wildcard);
+    async findTermWildcard(text, dictionaries, wildcard) {
+        const definitions = await this.database.findTermsBulk([text], dictionaries, wildcard);
         if (definitions.length === 0) {
             return [];
         }
@@ -287,7 +283,7 @@ class Translator {
         }];
     }
 
-    async findTermDeinflections(text, titles, options) {
+    async findTermDeinflections(text, dictionaries, options) {
         const deinflections = this.getAllDeinflections(text, options);
 
         if (deinflections.length === 0) {
@@ -309,7 +305,7 @@ class Translator {
             deinflectionArray.push(deinflection);
         }
 
-        const definitions = await this.database.findTermsBulk(uniqueDeinflectionTerms, titles, null);
+        const definitions = await this.database.findTermsBulk(uniqueDeinflectionTerms, dictionaries, null);
 
         for (const definition of definitions) {
             const definitionRules = Deinflector.rulesToRuleFlags(definition.rules);
@@ -399,13 +395,12 @@ class Translator {
 
     async findKanji(text, options) {
         const dictionaries = dictEnabledSet(options);
-        const titles = Object.keys(dictionaries);
         const kanjiUnique = new Set();
         for (const c of text) {
             kanjiUnique.add(c);
         }
 
-        const definitions = await this.database.findKanjiBulk([...kanjiUnique], titles);
+        const definitions = await this.database.findKanjiBulk([...kanjiUnique], dictionaries);
         if (definitions.length === 0) {
             return definitions;
         }
@@ -425,12 +420,12 @@ class Translator {
             definition.stats = stats;
         }
 
-        await this.buildKanjiMeta(definitions, titles);
+        await this.buildKanjiMeta(definitions, dictionaries);
 
         return definitions;
     }
 
-    async buildTermMeta(definitions, titles) {
+    async buildTermMeta(definitions, dictionaries) {
         const terms = [];
         for (const definition of definitions) {
             if (definition.expressions) {
@@ -464,7 +459,7 @@ class Translator {
             term.frequencies = [];
         }
 
-        const metas = await this.database.findTermMetaBulk(expressionsUnique, titles);
+        const metas = await this.database.findTermMetaBulk(expressionsUnique, dictionaries);
         for (const {expression, mode, data, dictionary, index} of metas) {
             switch (mode) {
                 case 'freq':
@@ -476,14 +471,14 @@ class Translator {
         }
     }
 
-    async buildKanjiMeta(definitions, titles) {
+    async buildKanjiMeta(definitions, dictionaries) {
         const kanjiList = [];
         for (const definition of definitions) {
             kanjiList.push(definition.character);
             definition.frequencies = [];
         }
 
-        const metas = await this.database.findKanjiMetaBulk(kanjiList, titles);
+        const metas = await this.database.findKanjiMetaBulk(kanjiList, dictionaries);
         for (const {character, mode, data, dictionary, index} of metas) {
             switch (mode) {
                 case 'freq':
-- 
cgit v1.2.3


From 1c828d205c7cb8fd095b70ee9cd70f14ac5b044d Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:01:44 -0500
Subject: Remove unused dictRowsSort

---
 ext/bg/js/dictionary.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index d9a7a865..afdcc6b9 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -42,20 +42,6 @@ function dictConfigured(options) {
     return false;
 }
 
-function dictRowsSort(rows, options) {
-    return rows.sort((ra, rb) => {
-        const pa = (options.dictionaries[ra.title] || {}).priority || 0;
-        const pb = (options.dictionaries[rb.title] || {}).priority || 0;
-        if (pa > pb) {
-            return -1;
-        } else if (pa < pb) {
-            return 1;
-        } else {
-            return 0;
-        }
-    });
-}
-
 function dictTermsSort(definitions, dictionaries=null) {
     return definitions.sort((v1, v2) => {
         let i;
-- 
cgit v1.2.3


From b6718dc4a402c07680b4f1e894a632373068350d Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:09:59 -0500
Subject: Use findTerms instead of findTermsInternal

---
 ext/bg/js/backend.js    |  7 ++++---
 ext/bg/js/translator.js | 11 +++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index a4d085e0..16dffc85 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -319,7 +319,8 @@ class Backend {
 
     async _onApiTermsFind({text, details, optionsContext}) {
         const options = await this.getOptions(optionsContext);
-        const [definitions, length] = await this.translator.findTerms(text, details, options);
+        const mode = options.general.resultOutputMode;
+        const [definitions, length] = await this.translator.findTerms(mode, text, details, options);
         definitions.splice(options.general.maxResults);
         return {length, definitions};
     }
@@ -329,9 +330,9 @@ class Backend {
         const results = [];
         while (text.length > 0) {
             const term = [];
-            const [definitions, sourceLength] = await this.translator.findTermsInternal(
+            const [definitions, sourceLength] = await this.translator.findTerms(
+                'simple',
                 text.substring(0, options.scanning.length),
-                dictEnabledSet(options),
                 {},
                 options
             );
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index c7017328..17b9e4ff 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -141,14 +141,16 @@ class Translator {
         return result;
     }
 
-    async findTerms(text, details, options) {
-        switch (options.general.resultOutputMode) {
+    async findTerms(mode, text, details, options) {
+        switch (mode) {
             case 'group':
                 return await this.findTermsGrouped(text, details, options);
             case 'merge':
                 return await this.findTermsMerged(text, details, options);
             case 'split':
                 return await this.findTermsSplit(text, details, options);
+            case 'simple':
+                return await this.findTermsSimple(text, details, options);
             default:
                 return [[], 0];
         }
@@ -216,6 +218,11 @@ class Translator {
         return [definitions, length];
     }
 
+    async findTermsSimple(text, details, options) {
+        const dictionaries = dictEnabledSet(options);
+        return await this.findTermsInternal(text, dictionaries, details, options);
+    }
+
     async findTermsInternal(text, dictionaries, details, options) {
         text = Translator.getSearchableText(text, options);
         if (text.length === 0) {
-- 
cgit v1.2.3


From 5e8b408a2317e8280a9c0e84681d304b6c8167f1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:25:22 -0500
Subject: Change secondarySearchTitles to secondarySearchDictionaries

---
 ext/bg/js/dictionary.js |  3 ++-
 ext/bg/js/translator.js | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index afdcc6b9..4a0b46cb 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -26,7 +26,8 @@ function dictEnabledSet(options) {
         const dictionary = optionsDictionaries[title];
         if (!dictionary.enabled) { continue; }
         enabledDictionaryMap.set(title, {
-            priority: dictionary.priority || 0
+            priority: dictionary.priority || 0,
+            allowSecondarySearches: !!dictionary.allowSecondarySearches
         });
     }
     return enabledDictionaryMap;
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 17b9e4ff..0a3d535f 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -70,8 +70,8 @@ class Translator {
         return {sequencedDefinitions, defaultDefinitions};
     }
 
-    async getMergedSecondarySearchResults(text, expressionsMap, secondarySearchTitles) {
-        if (secondarySearchTitles.length === 0) {
+    async getMergedSecondarySearchResults(text, expressionsMap, secondarySearchDictionaries) {
+        if (secondarySearchDictionaries.length === 0) {
             return [];
         }
 
@@ -85,7 +85,7 @@ class Translator {
             }
         }
 
-        const definitions = await this.database.findTermsExactBulk(expressionList, readingList, new Set(secondarySearchTitles));
+        const definitions = await this.database.findTermsExactBulk(expressionList, readingList, secondarySearchDictionaries);
         for (const definition of definitions) {
             const definitionTags = await this.expandTags(definition.definitionTags, definition.dictionary);
             definitionTags.push(dictTagBuildSource(definition.dictionary));
@@ -101,7 +101,7 @@ class Translator {
         return definitions;
     }
 
-    async getMergedDefinition(text, dictionaries, sequencedDefinition, defaultDefinitions, secondarySearchTitles, mergedByTermIndices) {
+    async getMergedDefinition(text, dictionaries, sequencedDefinition, defaultDefinitions, secondarySearchDictionaries, mergedByTermIndices) {
         const result = sequencedDefinition.definitions;
         const rawDefinitionsBySequence = sequencedDefinition.rawDefinitions;
 
@@ -114,7 +114,7 @@ class Translator {
         }
 
         const definitionsByGloss = dictTermsMergeByGloss(result, rawDefinitionsBySequence);
-        const secondarySearchResults = await this.getMergedSecondarySearchResults(text, result.expressions, secondarySearchTitles);
+        const secondarySearchResults = await this.getMergedSecondarySearchResults(text, result.expressions, secondarySearchDictionaries);
 
         dictTermsMergeByGloss(result, defaultDefinitions.concat(secondarySearchResults), definitionsByGloss, mergedByTermIndices);
 
@@ -174,7 +174,12 @@ class Translator {
 
     async findTermsMerged(text, details, options) {
         const dictionaries = dictEnabledSet(options);
-        const secondarySearchTitles = Object.keys(options.dictionaries).filter((dict) => options.dictionaries[dict].allowSecondarySearches);
+        const secondarySearchDictionaries = new Map();
+        for (const [title, dictionary] of dictionaries.entries()) {
+            if (!dictionary.allowSecondarySearches) { continue; }
+            secondarySearchDictionaries.set(title, dictionary);
+        }
+
         const [definitions, length] = await this.findTermsInternal(text, dictionaries, details, options);
         const {sequencedDefinitions, defaultDefinitions} = await this.getSequencedDefinitions(definitions, options.general.mainDictionary);
         const definitionsMerged = [];
@@ -186,7 +191,7 @@ class Translator {
                 dictionaries,
                 sequencedDefinition,
                 defaultDefinitions,
-                secondarySearchTitles,
+                secondarySearchDictionaries,
                 mergedByTermIndices
             );
             definitionsMerged.push(result);
-- 
cgit v1.2.3


From 89af73b61b04c9bf9042aec6bad9539492a4233c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:17:11 -0500
Subject: Use Map

---
 ext/bg/js/dictionary.js | 27 ++++++++++++++-------------
 ext/bg/js/translator.js |  3 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 4a0b46cb..5a85bb5b 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -175,10 +175,10 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
     return [sequencedDefinitions, nonSequencedDefinitions];
 }
 
-function dictTermsMergeByGloss(result, definitions, appendTo, mergedIndices) {
-    const definitionsByGloss = appendTo || {};
+function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices=null) {
+    const definitionsByGloss = appendTo !== null ? appendTo : new Map();
     for (const [index, definition] of definitions.entries()) {
-        if (appendTo) {
+        if (appendTo !== null) {
             let match = false;
             for (const expression of result.expressions.keys()) {
                 if (definition.expression === expression) {
@@ -196,14 +196,15 @@ function dictTermsMergeByGloss(result, definitions, appendTo, mergedIndices) {
 
             if (!match) {
                 continue;
-            } else if (mergedIndices) {
+            } else if (mergedIndices !== null) {
                 mergedIndices.add(index);
             }
         }
 
         const gloss = JSON.stringify(definition.glossary.concat(definition.dictionary));
-        if (!definitionsByGloss[gloss]) {
-            definitionsByGloss[gloss] = {
+        let glossDefinition = definitionsByGloss.get(gloss);
+        if (typeof glossDefinition === 'undefined') {
+            glossDefinition = {
                 expression: new Set(),
                 reading: new Set(),
                 definitionTags: [],
@@ -214,21 +215,22 @@ function dictTermsMergeByGloss(result, definitions, appendTo, mergedIndices) {
                 id: definition.id,
                 dictionary: definition.dictionary
             };
+            definitionsByGloss.set(gloss, glossDefinition);
         }
 
-        definitionsByGloss[gloss].expression.add(definition.expression);
-        definitionsByGloss[gloss].reading.add(definition.reading);
+        glossDefinition.expression.add(definition.expression);
+        glossDefinition.reading.add(definition.reading);
 
         result.expression.add(definition.expression);
         result.reading.add(definition.reading);
 
         for (const tag of definition.definitionTags) {
-            if (!definitionsByGloss[gloss].definitionTags.find((existingTag) => existingTag.name === tag.name)) {
-                definitionsByGloss[gloss].definitionTags.push(tag);
+            if (!glossDefinition.definitionTags.find((existingTag) => existingTag.name === tag.name)) {
+                glossDefinition.definitionTags.push(tag);
             }
         }
 
-        if (!appendTo) {
+        if (appendTo === null) {
             // result->expressions[ Expression1[ Reading1[ Tag1, Tag2 ] ], Expression2, ... ]
             if (!result.expressions.has(definition.expression)) {
                 result.expressions.set(definition.expression, new Map());
@@ -245,8 +247,7 @@ function dictTermsMergeByGloss(result, definitions, appendTo, mergedIndices) {
         }
     }
 
-    for (const gloss in definitionsByGloss) {
-        const definition = definitionsByGloss[gloss];
+    for (const definition of definitionsByGloss.values()) {
         definition.only = [];
         if (!utilSetEqual(definition.expression, result.expression)) {
             for (const expression of utilSetIntersection(definition.expression, result.expression)) {
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 0a3d535f..9a69e30e 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -118,8 +118,7 @@ class Translator {
 
         dictTermsMergeByGloss(result, defaultDefinitions.concat(secondarySearchResults), definitionsByGloss, mergedByTermIndices);
 
-        for (const gloss in definitionsByGloss) {
-            const definition = definitionsByGloss[gloss];
+        for (const definition of definitionsByGloss.values()) {
             dictTagsSort(definition.definitionTags);
             result.definitions.push(definition);
         }
-- 
cgit v1.2.3


From 50a171bc75f3329fec9d0aa24c4838f675a1b66d Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:00:01 -0500
Subject: Simplify update of mergedIndices

---
 ext/bg/js/dictionary.js | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 5a85bb5b..532d17c7 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -178,26 +178,15 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
 function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices=null) {
     const definitionsByGloss = appendTo !== null ? appendTo : new Map();
     for (const [index, definition] of definitions.entries()) {
-        if (appendTo !== null) {
-            let match = false;
-            for (const expression of result.expressions.keys()) {
-                if (definition.expression === expression) {
-                    for (const reading of result.expressions.get(expression).keys()) {
-                        if (definition.reading === reading) {
-                            match = true;
-                            break;
-                        }
-                    }
-                }
-                if (match) {
-                    break;
-                }
-            }
-
-            if (!match) {
-                continue;
-            } else if (mergedIndices !== null) {
+        if (mergedIndices !== null) {
+            const expressionMap = result.expressions.get(definition.expression);
+            if (
+                typeof expressionMap !== 'undefined' &&
+                typeof expressionMap.get(definition.reading) !== 'undefined'
+            ) {
                 mergedIndices.add(index);
+            } else {
+                continue;
             }
         }
 
-- 
cgit v1.2.3


From 45c685d00a7b98c33118dc50efd780e5be483936 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:05:09 -0500
Subject: Add variables for expression and reading

---
 ext/bg/js/dictionary.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 532d17c7..3a4a58a1 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -178,11 +178,13 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
 function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices=null) {
     const definitionsByGloss = appendTo !== null ? appendTo : new Map();
     for (const [index, definition] of definitions.entries()) {
+        const {expression, reading} = definition;
+
         if (mergedIndices !== null) {
-            const expressionMap = result.expressions.get(definition.expression);
+            const expressionMap = result.expressions.get(expression);
             if (
                 typeof expressionMap !== 'undefined' &&
-                typeof expressionMap.get(definition.reading) !== 'undefined'
+                typeof expressionMap.get(reading) !== 'undefined'
             ) {
                 mergedIndices.add(index);
             } else {
@@ -207,11 +209,11 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
             definitionsByGloss.set(gloss, glossDefinition);
         }
 
-        glossDefinition.expression.add(definition.expression);
-        glossDefinition.reading.add(definition.reading);
+        glossDefinition.expression.add(expression);
+        glossDefinition.reading.add(reading);
 
-        result.expression.add(definition.expression);
-        result.reading.add(definition.reading);
+        result.expression.add(expression);
+        result.reading.add(reading);
 
         for (const tag of definition.definitionTags) {
             if (!glossDefinition.definitionTags.find((existingTag) => existingTag.name === tag.name)) {
@@ -221,16 +223,16 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
 
         if (appendTo === null) {
             // result->expressions[ Expression1[ Reading1[ Tag1, Tag2 ] ], Expression2, ... ]
-            if (!result.expressions.has(definition.expression)) {
-                result.expressions.set(definition.expression, new Map());
+            if (!result.expressions.has(expression)) {
+                result.expressions.set(expression, new Map());
             }
-            if (!result.expressions.get(definition.expression).has(definition.reading)) {
-                result.expressions.get(definition.expression).set(definition.reading, []);
+            if (!result.expressions.get(expression).has(reading)) {
+                result.expressions.get(expression).set(reading, []);
             }
 
             for (const tag of definition.termTags) {
-                if (!result.expressions.get(definition.expression).get(definition.reading).find((existingTag) => existingTag.name === tag.name)) {
-                    result.expressions.get(definition.expression).get(definition.reading).push(tag);
+                if (!result.expressions.get(expression).get(reading).find((existingTag) => existingTag.name === tag.name)) {
+                    result.expressions.get(expression).get(reading).push(tag);
                 }
             }
         }
@@ -251,7 +253,7 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
     }
 
     return definitionsByGloss;
-}
+  }
 
 function dictTagBuildSource(name) {
     return dictTagSanitize({name, category: 'dictionary', order: 100});
-- 
cgit v1.2.3


From 69b5007842e08a8fda4016712a5046f81799e638 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:15:24 -0500
Subject: Reduce number of redundant Map.get calls in dictTermsMergeByGloss

---
 ext/bg/js/dictionary.js | 31 ++++++++++++++++++++++++-------
 ext/bg/js/translator.js |  3 ++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 3a4a58a1..786546ea 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -222,17 +222,34 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
         }
 
         if (appendTo === null) {
-            // result->expressions[ Expression1[ Reading1[ Tag1, Tag2 ] ], Expression2, ... ]
-            if (!result.expressions.has(expression)) {
-                result.expressions.set(expression, new Map());
+            /*
+                Data layout:
+                result.expressions = new Map([
+                    [expression, new Map([
+                        [reading, new Map([
+                            [tagName, tagInfo],
+                            ...
+                        ])],
+                        ...
+                    ])],
+                    ...
+                ]);
+            */
+            let readingMap = result.expressions.get(expression);
+            if (typeof readingMap === 'undefined') {
+                readingMap = new Map();
+                result.expressions.set(expression, readingMap);
             }
-            if (!result.expressions.get(expression).has(reading)) {
-                result.expressions.get(expression).set(reading, []);
+
+            let termTagsMap = readingMap.get(reading);
+            if (typeof termTagsMap === 'undefined') {
+                termTagsMap = new Map();
+                readingMap.set(reading, termTagsMap);
             }
 
             for (const tag of definition.termTags) {
-                if (!result.expressions.get(expression).get(reading).find((existingTag) => existingTag.name === tag.name)) {
-                    result.expressions.get(expression).get(reading).push(tag);
+                if (!termTagsMap.has(tag.name)) {
+                    termTagsMap.set(tag.name, tag);
                 }
             }
         }
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 9a69e30e..6cf07d93 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -127,7 +127,8 @@ class Translator {
 
         const expressions = [];
         for (const [expression, readingMap] of result.expressions.entries()) {
-            for (const [reading, termTags] of readingMap.entries()) {
+            for (const [reading, termTagsMap] of readingMap.entries()) {
+                const termTags = [...termTagsMap.values()];
                 const score = termTags.map((tag) => tag.score).reduce((p, v) => p + v, 0);
                 expressions.push(Translator.createExpression(expression, reading, dictTagsSort(termTags), Translator.scoreToTermFrequency(score)));
             }
-- 
cgit v1.2.3


From 19fb7dacb4c951906c5ce3094711f436b0e06c02 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:23:29 -0500
Subject: Assign result properties to variables to reduce number of lookups

---
 ext/bg/js/dictionary.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 786546ea..1bc3c93c 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -177,11 +177,17 @@ function dictTermsMergeBySequence(definitions, mainDictionary) {
 
 function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices=null) {
     const definitionsByGloss = appendTo !== null ? appendTo : new Map();
+
+    const resultExpressionsMap = result.expressions;
+    const resultExpressionSet = result.expression;
+    const resultReadingSet = result.reading;
+    const resultSource = result.source;
+
     for (const [index, definition] of definitions.entries()) {
         const {expression, reading} = definition;
 
         if (mergedIndices !== null) {
-            const expressionMap = result.expressions.get(expression);
+            const expressionMap = resultExpressionsMap.get(expression);
             if (
                 typeof expressionMap !== 'undefined' &&
                 typeof expressionMap.get(reading) !== 'undefined'
@@ -200,7 +206,7 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
                 reading: new Set(),
                 definitionTags: [],
                 glossary: definition.glossary,
-                source: result.source,
+                source: resultSource,
                 reasons: [],
                 score: definition.score,
                 id: definition.id,
@@ -212,8 +218,8 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
         glossDefinition.expression.add(expression);
         glossDefinition.reading.add(reading);
 
-        result.expression.add(expression);
-        result.reading.add(reading);
+        resultExpressionSet.add(expression);
+        resultReadingSet.add(reading);
 
         for (const tag of definition.definitionTags) {
             if (!glossDefinition.definitionTags.find((existingTag) => existingTag.name === tag.name)) {
@@ -235,10 +241,10 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
                     ...
                 ]);
             */
-            let readingMap = result.expressions.get(expression);
+            let readingMap = resultExpressionsMap.get(expression);
             if (typeof readingMap === 'undefined') {
                 readingMap = new Map();
-                result.expressions.set(expression, readingMap);
+                resultExpressionsMap.set(expression, readingMap);
             }
 
             let termTagsMap = readingMap.get(reading);
@@ -257,13 +263,13 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
 
     for (const definition of definitionsByGloss.values()) {
         definition.only = [];
-        if (!utilSetEqual(definition.expression, result.expression)) {
-            for (const expression of utilSetIntersection(definition.expression, result.expression)) {
+        if (!utilSetEqual(definition.expression, resultExpressionSet)) {
+            for (const expression of utilSetIntersection(definition.expression, resultExpressionSet)) {
                 definition.only.push(expression);
             }
         }
-        if (!utilSetEqual(definition.reading, result.reading)) {
-            for (const reading of utilSetIntersection(definition.reading, result.reading)) {
+        if (!utilSetEqual(definition.reading, resultReadingSet)) {
+            for (const reading of utilSetIntersection(definition.reading, resultReadingSet)) {
                 definition.only.push(reading);
             }
         }
-- 
cgit v1.2.3


From f143632f28d3bc2f89144958ff49e9e0b1932c96 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:31:08 -0500
Subject: Simplify only assignment

---
 ext/bg/js/dictionary.js | 43 +++++++++++++++++++++++++++++++++----------
 ext/bg/js/util.js       | 26 --------------------------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 1bc3c93c..bffa7afa 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global utilSetEqual, utilSetIntersection, apiTemplateRender*/
+/*global apiTemplateRender*/
 
 function dictEnabledSet(options) {
     const enabledDictionaryMap = new Map();
@@ -145,6 +145,30 @@ function dictTermsGroup(definitions, dictionaries) {
     return dictTermsSort(results);
 }
 
+function dictAreSetsEqual(set1, set2) {
+    if (set1.size !== set2.size) {
+        return false;
+    }
+
+    for (const value of set1) {
+        if (!set2.has(value)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+function dictGetSetIntersection(set1, set2) {
+    const result = [];
+    for (const value of set1) {
+        if (set2.has(value)) {
+            result.push(value);
+        }
+    }
+    return result;
+}
+
 function dictTermsMergeBySequence(definitions, mainDictionary) {
     const sequencedDefinitions = new Map();
     const nonSequencedDefinitions = [];
@@ -262,16 +286,15 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
     }
 
     for (const definition of definitionsByGloss.values()) {
-        definition.only = [];
-        if (!utilSetEqual(definition.expression, resultExpressionSet)) {
-            for (const expression of utilSetIntersection(definition.expression, resultExpressionSet)) {
-                definition.only.push(expression);
-            }
+        const only = [];
+        const expressionSet = definition.expression;
+        const readingSet = definition.reading;
+        definition.only = only;
+        if (!dictAreSetsEqual(expressionSet, resultExpressionSet)) {
+            only.push(...dictGetSetIntersection(expressionSet, resultExpressionSet));
         }
-        if (!utilSetEqual(definition.reading, resultReadingSet)) {
-            for (const reading of utilSetIntersection(definition.reading, resultReadingSet)) {
-                definition.only.push(reading);
-            }
+        if (!dictAreSetsEqual(readingSet, resultReadingSet)) {
+            only.push(...dictGetSetIntersection(readingSet, resultReadingSet));
         }
     }
 
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 333e814b..9ebd2ac4 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -59,32 +59,6 @@ function utilBackgroundFunctionIsolate(func) {
     return backgroundPage.utilFunctionIsolate(func);
 }
 
-function utilSetEqual(setA, setB) {
-    if (setA.size !== setB.size) {
-        return false;
-    }
-
-    for (const value of setA) {
-        if (!setB.has(value)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-function utilSetIntersection(setA, setB) {
-    return new Set(
-        [...setA].filter((value) => setB.has(value))
-    );
-}
-
-function utilSetDifference(setA, setB) {
-    return new Set(
-        [...setA].filter((value) => !setB.has(value))
-    );
-}
-
 function utilStringHashCode(string) {
     let hashCode = 0;
 
-- 
cgit v1.2.3


From 54bb702b843ae9a312704f27e282bf340e8197fc Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 11:30:24 -0500
Subject: Updates for PR feedback

---
 ext/bg/js/dictionary.js | 10 +++++-----
 ext/bg/js/translator.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index bffa7afa..f5c5b21b 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -49,8 +49,8 @@ function dictTermsSort(definitions, dictionaries=null) {
         if (dictionaries !== null) {
             const dictionaryInfo1 = dictionaries.get(v1.dictionary);
             const dictionaryInfo2 = dictionaries.get(v2.dictionary);
-            const priority1 = typeof dictionaryInfo1 !== 'undefined' ? dictionaryInfo1.priority || 0 : 0;
-            const priority2 = typeof dictionaryInfo2 !== 'undefined' ? dictionaryInfo2.priority || 0 : 0;
+            const priority1 = typeof dictionaryInfo1 !== 'undefined' ? dictionaryInfo1.priority : 0;
+            const priority2 = typeof dictionaryInfo2 !== 'undefined' ? dictionaryInfo2.priority : 0;
             i = priority2 - priority1;
             if (i !== 0) { return i; }
         }
@@ -254,7 +254,7 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
         if (appendTo === null) {
             /*
                 Data layout:
-                result.expressions = new Map([
+                resultExpressionsMap = new Map([
                     [expression, new Map([
                         [reading, new Map([
                             [tagName, tagInfo],
@@ -289,17 +289,17 @@ function dictTermsMergeByGloss(result, definitions, appendTo=null, mergedIndices
         const only = [];
         const expressionSet = definition.expression;
         const readingSet = definition.reading;
-        definition.only = only;
         if (!dictAreSetsEqual(expressionSet, resultExpressionSet)) {
             only.push(...dictGetSetIntersection(expressionSet, resultExpressionSet));
         }
         if (!dictAreSetsEqual(readingSet, resultReadingSet)) {
             only.push(...dictGetSetIntersection(readingSet, resultReadingSet));
         }
+        definition.only = only;
     }
 
     return definitionsByGloss;
-  }
+}
 
 function dictTagBuildSource(name) {
     return dictTagSanitize({name, category: 'dictionary', order: 100});
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 6cf07d93..a675a9f7 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -71,7 +71,7 @@ class Translator {
     }
 
     async getMergedSecondarySearchResults(text, expressionsMap, secondarySearchDictionaries) {
-        if (secondarySearchDictionaries.length === 0) {
+        if (secondarySearchDictionaries.size === 0) {
             return [];
         }
 
-- 
cgit v1.2.3


From 418e7f9968ba8a6e302ec1e1b6d7dafe4b85fd97 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 14:42:05 -0500
Subject: Update titles type

---
 test/test-database.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/test-database.js b/test/test-database.js
index 4fb3805d..04ed8100 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -136,7 +136,9 @@ async function testDatabase1() {
     const testDictionaryIndex = JSON.parse(await testDictionary.files['index.json'].async('string'));
 
     const title = testDictionaryIndex.title;
-    const titles = [title];
+    const titles = new Map([
+        [title, {priority: 0, allowSecondarySearches: false}]
+    ]);
 
     // Setup iteration data
     const iterations = [
@@ -815,7 +817,9 @@ async function testDatabase2() {
     const testDictionaryIndex = JSON.parse(await testDictionary.files['index.json'].async('string'));
 
     const title = testDictionaryIndex.title;
-    const titles = [title];
+    const titles = new Map([
+        [title, {priority: 0, allowSecondarySearches: false}]
+    ]);
 
     // Setup database
     const database = new Database();
-- 
cgit v1.2.3


From 1944f7a2157fd63fd04beb374ee5d9fb797e2531 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:46:20 -0500
Subject: Fix indent

---
 ext/bg/js/page-exit-prevention.js | 74 +++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/ext/bg/js/page-exit-prevention.js b/ext/bg/js/page-exit-prevention.js
index 3a320db3..be06c495 100644
--- a/ext/bg/js/page-exit-prevention.js
+++ b/ext/bg/js/page-exit-prevention.js
@@ -18,43 +18,43 @@
 
 
 class PageExitPrevention {
-  constructor() {
-  }
-
-  start() {
-      PageExitPrevention._addInstance(this);
-  }
-
-  end() {
-      PageExitPrevention._removeInstance(this);
-  }
-
-  static _addInstance(instance) {
-      const size = PageExitPrevention._instances.size;
-      PageExitPrevention._instances.set(instance, true);
-      if (size === 0) {
-          window.addEventListener('beforeunload', PageExitPrevention._onBeforeUnload);
-      }
-  }
-
-  static _removeInstance(instance) {
-      if (
-          PageExitPrevention._instances.delete(instance) &&
-          PageExitPrevention._instances.size === 0
-      ) {
-          window.removeEventListener('beforeunload', PageExitPrevention._onBeforeUnload);
-      }
-  }
-
-  static _onBeforeUnload(e) {
-      if (PageExitPrevention._instances.size === 0) {
-          return;
-      }
-
-      e.preventDefault();
-      e.returnValue = '';
-      return '';
-  }
+    constructor() {
+    }
+
+    start() {
+        PageExitPrevention._addInstance(this);
+    }
+
+    end() {
+        PageExitPrevention._removeInstance(this);
+    }
+
+    static _addInstance(instance) {
+        const size = PageExitPrevention._instances.size;
+        PageExitPrevention._instances.set(instance, true);
+        if (size === 0) {
+            window.addEventListener('beforeunload', PageExitPrevention._onBeforeUnload);
+        }
+    }
+
+    static _removeInstance(instance) {
+        if (
+            PageExitPrevention._instances.delete(instance) &&
+            PageExitPrevention._instances.size === 0
+        ) {
+            window.removeEventListener('beforeunload', PageExitPrevention._onBeforeUnload);
+        }
+    }
+
+    static _onBeforeUnload(e) {
+        if (PageExitPrevention._instances.size === 0) {
+            return;
+        }
+
+        e.preventDefault();
+        e.returnValue = '';
+        return '';
+    }
 }
 
 PageExitPrevention._instances = new Map();
-- 
cgit v1.2.3


From 6d75637ace341b79a6a12c7854b13fb1c279498f Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:48:02 -0500
Subject: Fix brace style issues

---
 ext/bg/js/backend.js  | 21 +++++++++++++++------
 ext/fg/js/document.js |  3 +--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 16dffc85..7c71f82c 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -801,8 +801,11 @@ class Backend {
         await new Promise((resolve, reject) => {
             chrome.tabs.update(tab.id, {active: true}, () => {
                 const e = chrome.runtime.lastError;
-                if (e) { reject(e); }
-                else { resolve(); }
+                if (e) {
+                    reject(e);
+                } else {
+                    resolve();
+                }
             });
         });
 
@@ -815,16 +818,22 @@ class Backend {
             const tabWindow = await new Promise((resolve, reject) => {
                 chrome.windows.get(tab.windowId, {}, (tabWindow) => {
                     const e = chrome.runtime.lastError;
-                    if (e) { reject(e); }
-                    else { resolve(tabWindow); }
+                    if (e) {
+                        reject(e);
+                    } else {
+                        resolve(tabWindow);
+                    }
                 });
             });
             if (!tabWindow.focused) {
                 await new Promise((resolve, reject) => {
                     chrome.windows.update(tab.windowId, {focused: true}, () => {
                         const e = chrome.runtime.lastError;
-                        if (e) { reject(e); }
-                        else { resolve(); }
+                        if (e) {
+                            reject(e);
+                        } else {
+                            resolve();
+                        }
                     });
                 });
             }
diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index 7284cdd1..ea9ac965 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -192,8 +192,7 @@ function docSentenceExtract(source, extent) {
             if (terminators.includes(c)) {
                 endPos = i + 1;
                 break;
-            }
-            else if (c in quotesBwd) {
+            } else if (c in quotesBwd) {
                 endPos = i;
                 break;
             }
-- 
cgit v1.2.3


From aa76113e756391da64d84d368c3b103c873519cb Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:49:07 -0500
Subject: Fix block padding

---
 ext/bg/js/settings/backup.js | 1 -
 ext/mixed/js/audio.js        | 2 --
 2 files changed, 3 deletions(-)

diff --git a/ext/bg/js/settings/backup.js b/ext/bg/js/settings/backup.js
index 6d1f28e9..f4d622a4 100644
--- a/ext/bg/js/settings/backup.js
+++ b/ext/bg/js/settings/backup.js
@@ -163,7 +163,6 @@ async function _showSettingsImportWarnings(warnings) {
                 sanitize: e.currentTarget.dataset.importSanitize === 'true'
             });
             modalNode.modal('hide');
-
         };
         const onModalHide = () => {
             complete({result: false});
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
index fe5982dd..b5a025be 100644
--- a/ext/mixed/js/audio.js
+++ b/ext/mixed/js/audio.js
@@ -54,7 +54,6 @@ class TextToSpeechAudio {
 
             speechSynthesis.cancel();
             speechSynthesis.speak(this._utterance);
-
         } catch (e) {
             // NOP
         }
@@ -82,7 +81,6 @@ class TextToSpeechAudio {
 
         return new TextToSpeechAudio(text, voice);
     }
-
 }
 
 function audioGetFromUrl(url, willDownload) {
-- 
cgit v1.2.3


From c3e7280365a78f648ab15c8460cabfb276e077d4 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:49:20 -0500
Subject: Simplify ternary

---
 ext/bg/js/search-query-parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index 3d38e6e8..8c434990 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -59,7 +59,7 @@ class QueryParser extends TextScanner {
 
         this.search.setContent('terms', {definitions, context: {
             focus: false,
-            disableHistory: cause === 'mouse' ? true : false,
+            disableHistory: cause === 'mouse',
             sentence: {text: searchText, offset: 0},
             url: window.location.href
         }});
-- 
cgit v1.2.3


From 56567903a5935a7e57e7a8134e3c118a2188babb Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:49:56 -0500
Subject: Fix unnamed functions

---
 ext/bg/js/settings/popup-preview-frame.js | 4 ++--
 ext/bg/js/util.js                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 890b8c96..aa2b6100 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -60,8 +60,8 @@ class SettingsPopupPreview {
 
         this.frontend = new Frontend(this.popup);
 
-        this.frontend.setEnabled = function () {};
-        this.frontend.searchClear = function () {};
+        this.frontend.setEnabled = () => {};
+        this.frontend.searchClear = () => {};
 
         await this.frontend.prepare();
 
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 9ebd2ac4..5ce4b08c 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -33,7 +33,7 @@ function utilIsolate(value) {
 }
 
 function utilFunctionIsolate(func) {
-    return function (...args) {
+    return function isolatedFunction(...args) {
         try {
             args = args.map((v) => utilIsolate(v));
             return func.call(this, ...args);
-- 
cgit v1.2.3


From 0c8f567e6db8f87974f472cac6bb065a5dd4d754 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:51:53 -0500
Subject: Fix indentation

---
 ext/mixed/js/text-scanner.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index db3835cf..ff0eac8b 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -141,18 +141,18 @@ class TextScanner {
         const textSourceCurrentPrevious = this.textSourceCurrent !== null ? this.textSourceCurrent.clone() : null;
 
         this.searchAt(primaryTouch.clientX, primaryTouch.clientY, 'touchStart')
-        .then(() => {
-            if (
-                this.textSourceCurrent === null ||
-                this.textSourceCurrent.equals(textSourceCurrentPrevious)
-            ) {
-                return;
-            }
+            .then(() => {
+                if (
+                    this.textSourceCurrent === null ||
+                    this.textSourceCurrent.equals(textSourceCurrentPrevious)
+                ) {
+                    return;
+                }
 
-            this.preventScroll = true;
-            this.preventNextContextMenu = true;
-            this.preventNextMouseDown = true;
-        });
+                this.preventScroll = true;
+                this.preventNextContextMenu = true;
+                this.preventNextMouseDown = true;
+            });
     }
 
     onTouchEnd(e) {
-- 
cgit v1.2.3


From b3212d776e3f6d735bc9d67acbebc28b7f061ba8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:11:29 -0500
Subject: Stylistic rules

---
 .eslintrc.json | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 9b0754fc..b21c00f4 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -21,11 +21,13 @@
         "curly": ["error", "all"],
         "dot-notation": "error",
         "eqeqeq": "error",
+        "func-names": ["error", "always"],
         "no-case-declarations": "error",
         "no-const-assign": "error",
         "no-constant-condition": "off",
         "no-global-assign": "error",
         "no-undef": "error",
+        "no-unneeded-ternary": "error",
         "no-unused-vars": ["error", {"vars": "local", "args": "after-used", "argsIgnorePattern": "^_", "caughtErrors": "none"}],
         "no-unused-expressions": "error",
         "no-var": "error",
@@ -34,6 +36,35 @@
         "quotes": ["error", "single", "avoid-escape"],
         "require-atomic-updates": "off",
         "semi": "error",
+
+        // Whitespace rules
+        "brace-style": ["error", "1tbs", {"allowSingleLine": true}],
+        "indent": ["error", 4, {"SwitchCase": 1, "MemberExpression": 1, "flatTernaryExpressions": true, "ignoredNodes": ["ConditionalExpression"]}],
+        "object-curly-newline": "error",
+        "padded-blocks": ["error", "never"],
+
+        "array-bracket-spacing": ["error", "never"],
+        "arrow-spacing": ["error", {"before": true, "after": true}],
+        "block-spacing": ["error", "always"],
+        "comma-spacing": ["error", { "before": false, "after": true }],
+        "computed-property-spacing": ["error", "never"],
+        "func-call-spacing": ["error", "never"],
+        "generator-star-spacing": ["error", "before"],
+        "key-spacing": ["error", {"beforeColon": false, "afterColon": true, "mode": "strict"}],
+        "keyword-spacing": ["error", {"before": true, "after": true}],
+        "no-trailing-spaces": "error",
+        "no-whitespace-before-property": "error",
+        "object-curly-spacing": ["error", "never"],
+        "rest-spread-spacing": ["error", "never"],
+        "semi-spacing": ["error", {"before": false, "after": true}],
+        "space-in-parens": ["error", "never"],
+        "space-unary-ops": "error",
+        "spaced-comment": ["error", "always", {"markers": ["global"]}],
+        "switch-colon-spacing": ["error", {"after": true, "before": false}],
+        "template-curly-spacing": ["error", "never"],
+        "template-tag-spacing": ["error", "never"],
+
+        // Extensions
         "no-unsanitized/method": "error",
         "no-unsanitized/property": "error"
     },
-- 
cgit v1.2.3


From c0d91bffc461c61af9d35aecb7c92e15648382b2 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 15:21:30 -0500
Subject: Add no-shadow

---
 .eslintrc.json                     |  1 +
 ext/bg/js/backend.js               | 32 ++++++++++++++++----------------
 ext/bg/js/database.js              |  4 ++--
 ext/bg/js/japanese.js              | 12 ++++++------
 ext/bg/js/json-schema.js           |  2 +-
 ext/bg/js/search.js                |  4 ++--
 ext/bg/js/settings/dictionaries.js |  2 +-
 ext/mixed/js/core.js               |  6 +++---
 8 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index b21c00f4..cfee7be8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,6 +26,7 @@
         "no-const-assign": "error",
         "no-constant-condition": "off",
         "no-global-assign": "error",
+        "no-shadow": ["error", {"builtinGlobals": false}],
         "no-undef": "error",
         "no-unneeded-ternary": "error",
         "no-unused-vars": ["error", {"vars": "local", "args": "after-used", "argsIgnorePattern": "^_", "caughtErrors": "none"}],
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 7c71f82c..2691b7d9 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -274,18 +274,18 @@ class Backend {
                 const node = nodes.pop();
                 for (const key of Object.keys(node.obj)) {
                     const path = node.path.concat(key);
-                    const obj = node.obj[key];
-                    if (obj !== null && typeof obj === 'object') {
-                        nodes.unshift({obj, path});
+                    const obj2 = node.obj[key];
+                    if (obj2 !== null && typeof obj2 === 'object') {
+                        nodes.unshift({obj: obj2, path});
                     } else {
-                        valuePaths.push([obj, path]);
+                        valuePaths.push([obj2, path]);
                     }
                 }
             }
             return valuePaths;
         }
 
-        function modifyOption(path, value, options) {
+        function modifyOption(path, value) {
             let pivot = options;
             for (const key of path.slice(0, -1)) {
                 if (!hasOwn(pivot, key)) {
@@ -298,7 +298,7 @@ class Backend {
         }
 
         for (const [value, path] of getValuePaths(changedOptions)) {
-            modifyOption(path, value, options);
+            modifyOption(path, value);
         }
 
         await this._onApiOptionsSave({source});
@@ -340,9 +340,9 @@ class Backend {
                 dictTermsSort(definitions);
                 const {expression, reading} = definitions[0];
                 const source = text.substring(0, sourceLength);
-                for (const {text, furigana} of jpDistributeFuriganaInflected(expression, reading, source)) {
-                    const reading = jpConvertReading(text, furigana, options.parsing.readingMode);
-                    term.push({text, reading});
+                for (const {text: text2, furigana} of jpDistributeFuriganaInflected(expression, reading, source)) {
+                    const reading2 = jpConvertReading(text2, furigana, options.parsing.readingMode);
+                    term.push({text: text2, reading: reading2});
                 }
                 text = text.substring(source.length);
             } else {
@@ -365,17 +365,17 @@ class Backend {
                 for (const {expression, reading, source} of parsedLine) {
                     const term = [];
                     if (expression !== null && reading !== null) {
-                        for (const {text, furigana} of jpDistributeFuriganaInflected(
+                        for (const {text: text2, furigana} of jpDistributeFuriganaInflected(
                             expression,
                             jpKatakanaToHiragana(reading),
                             source
                         )) {
-                            const reading = jpConvertReading(text, furigana, options.parsing.readingMode);
-                            term.push({text, reading});
+                            const reading2 = jpConvertReading(text2, furigana, options.parsing.readingMode);
+                            term.push({text: text2, reading: reading2});
                         }
                     } else {
-                        const reading = jpConvertReading(source, null, options.parsing.readingMode);
-                        term.push({text: source, reading});
+                        const reading2 = jpConvertReading(source, null, options.parsing.readingMode);
+                        term.push({text: source, reading: reading2});
                     }
                     result.push(term);
                 }
@@ -816,12 +816,12 @@ class Backend {
 
         try {
             const tabWindow = await new Promise((resolve, reject) => {
-                chrome.windows.get(tab.windowId, {}, (tabWindow) => {
+                chrome.windows.get(tab.windowId, {}, (value) => {
                     const e = chrome.runtime.lastError;
                     if (e) {
                         reject(e);
                     } else {
-                        resolve(tabWindow);
+                        resolve(value);
                     }
                 });
             });
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 1f6810cf..558f3ceb 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -809,9 +809,9 @@ class Database {
             for (const objectStoreName of objectStoreNames) {
                 const {primaryKey, indices} = stores[objectStoreName];
 
-                const objectStoreNames = transaction.objectStoreNames || db.objectStoreNames;
+                const objectStoreNames2 = transaction.objectStoreNames || db.objectStoreNames;
                 const objectStore = (
-                    Database._listContains(objectStoreNames, objectStoreName) ?
+                    Database._listContains(objectStoreNames2, objectStoreName) ?
                     transaction.objectStore(objectStoreName) :
                     db.createObjectStore(objectStoreName, primaryKey)
                 );
diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
index e8a6fa08..abb32da4 100644
--- a/ext/bg/js/japanese.js
+++ b/ext/bg/js/japanese.js
@@ -224,15 +224,15 @@ function jpDistributeFurigana(expression, reading) {
     }
 
     let isAmbiguous = false;
-    const segmentize = (reading, groups) => {
+    const segmentize = (reading2, groups) => {
         if (groups.length === 0 || isAmbiguous) {
             return [];
         }
 
         const group = groups[0];
         if (group.mode === 'kana') {
-            if (jpKatakanaToHiragana(reading).startsWith(jpKatakanaToHiragana(group.text))) {
-                const readingLeft = reading.substring(group.text.length);
+            if (jpKatakanaToHiragana(reading2).startsWith(jpKatakanaToHiragana(group.text))) {
+                const readingLeft = reading2.substring(group.text.length);
                 const segs = segmentize(readingLeft, groups.splice(1));
                 if (segs) {
                     return [{text: group.text}].concat(segs);
@@ -240,9 +240,9 @@ function jpDistributeFurigana(expression, reading) {
             }
         } else {
             let foundSegments = null;
-            for (let i = reading.length; i >= group.text.length; --i) {
-                const readingUsed = reading.substring(0, i);
-                const readingLeft = reading.substring(i);
+            for (let i = reading2.length; i >= group.text.length; --i) {
+                const readingUsed = reading2.substring(0, i);
+                const readingLeft = reading2.substring(i);
                 const segs = segmentize(readingLeft, groups.slice(1));
                 if (segs) {
                     if (foundSegments !== null) {
diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 3cf24c35..58f804fd 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -401,7 +401,7 @@ class JsonSchemaProxyHandler {
             info.valuePush(i, propertyValue);
             JsonSchemaProxyHandler.validate(propertyValue, propertySchema, info);
             info.valuePop();
-            for (let i = 0; i < schemaPath.length; ++i) { info.schemaPop(); }
+            for (let j = 0, jj = schemaPath.length; j < jj; ++j) { info.schemaPop(); }
         }
     }
 
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 76a62b97..98e167ad 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -70,7 +70,7 @@ class DisplaySearch extends Display {
                         this.wanakanaEnable.checked = false;
                     }
                     this.wanakanaEnable.addEventListener('change', (e) => {
-                        const {queryParams: {query=''}} = parseUrl(window.location.href);
+                        const {queryParams: {query: query2=''}} = parseUrl(window.location.href);
                         if (e.target.checked) {
                             window.wanakana.bind(this.query);
                             apiOptionsSet({general: {enableWanakana: true}}, this.getOptionsContext());
@@ -78,7 +78,7 @@ class DisplaySearch extends Display {
                             window.wanakana.unbind(this.query);
                             apiOptionsSet({general: {enableWanakana: false}}, this.getOptionsContext());
                         }
-                        this.setQuery(query);
+                        this.setQuery(query2);
                         this.onSearchQueryUpdated(this.query.value, false);
                     });
                 }
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 427f47f0..70a22a16 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -166,7 +166,7 @@ class SettingsDictionaryListUI {
         delete n.dataset.dict;
         $(n).modal('hide');
 
-        const index = this.dictionaryEntries.findIndex((e) => e.dictionaryInfo.title === title);
+        const index = this.dictionaryEntries.findIndex((entry) => entry.dictionaryInfo.title === title);
         if (index >= 0) {
             this.dictionaryEntries[index].deleteDictionary();
         }
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index 330a30fb..83813796 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -160,9 +160,9 @@ function promiseTimeout(delay, resolveValue) {
     const resolve = (value) => complete(promiseResolve, value);
     const reject = (value) => complete(promiseReject, value);
 
-    const promise = new Promise((resolve, reject) => {
-        promiseResolve = resolve;
-        promiseReject = reject;
+    const promise = new Promise((resolve2, reject2) => {
+        promiseResolve = resolve2;
+        promiseReject = reject2;
     });
     timer = window.setTimeout(() => {
         timer = null;
-- 
cgit v1.2.3


From f1ccd5280635f9528b2cfe4629222c627065781c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 15:28:10 -0500
Subject: Explicitly indicate that "no-param-reassign" is allowed

---
 .eslintrc.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index cfee7be8..2dc63e80 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,6 +26,7 @@
         "no-const-assign": "error",
         "no-constant-condition": "off",
         "no-global-assign": "error",
+        "no-param-reassign": "off",
         "no-shadow": ["error", {"builtinGlobals": false}],
         "no-undef": "error",
         "no-unneeded-ternary": "error",
-- 
cgit v1.2.3


From 9dd779836c34c6877c9736d937c3c4109b173b18 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 15:30:41 -0500
Subject: Add "no-prototype-builtins"

---
 .eslintrc.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 2dc63e80..fcc6995b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -27,6 +27,7 @@
         "no-constant-condition": "off",
         "no-global-assign": "error",
         "no-param-reassign": "off",
+        "no-prototype-builtins": "error",
         "no-shadow": ["error", {"builtinGlobals": false}],
         "no-undef": "error",
         "no-unneeded-ternary": "error",
-- 
cgit v1.2.3


From e3cfb3fbc709285e292fe5e8bb68ca8903e6c86b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 17 Feb 2020 15:36:58 -0500
Subject: Fix test-schema.js

---
 test/test-schema.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test-schema.js b/test/test-schema.js
index ca4f56dd..8ca63167 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -30,7 +30,7 @@ function testValidate1() {
         ]
     };
 
-    const schemaValidate = (value, schema) => {
+    const schemaValidate = (value) => {
         try {
             JsonSchema.validate(value, schema);
             return true;
@@ -48,7 +48,7 @@ function testValidate1() {
             ) &&
             (
                 (
-                    (value % 3 )=== 0 ||
+                    (value % 3) === 0 ||
                     (value % 5) === 0
                 ) &&
                 (value % 15) !== 0
@@ -81,7 +81,7 @@ function testGetValidValueOrDefault1() {
 
     const testData = [
         [
-            void(0),
+            void 0,
             {test: 'default'}
         ],
         [
@@ -210,7 +210,7 @@ function testGetValidValueOrDefault3() {
             {test: 'value', test2: 2, test3: 10}
         ],
         [
-            {test: 'value', test2: 2, test3: void(0)},
+            {test: 'value', test2: 2, test3: void 0},
             {test: 'value', test2: 2, test3: 10}
         ]
     ];
-- 
cgit v1.2.3


From 6513a15b3b5fd8586226c8823e2680478b97e132 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Feb 2020 14:54:57 -0500
Subject: Fix shadowing

---
 test/test-database.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/test-database.js b/test/test-database.js
index 04ed8100..44f409dd 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -36,8 +36,8 @@ class XMLHttpRequest {
         callbacks.push(callback);
     }
 
-    open(action, url) {
-        this._url = url;
+    open(action, url2) {
+        this._url = url2;
     }
 
     send() {
@@ -116,10 +116,10 @@ function clearDatabase(timeout) {
         (async () => {
             const indexedDB = global.indexedDB;
             for (const {name} of await indexedDB.databases()) {
-                await new Promise((resolve, reject) => {
+                await new Promise((resolve2, reject2) => {
                     const request = indexedDB.deleteDatabase(name);
-                    request.onerror = (e) => reject(e);
-                    request.onsuccess = () => resolve();
+                    request.onerror = (e) => reject2(e);
+                    request.onsuccess = () => resolve2();
                 });
             }
             clearTimeout(timer);
-- 
cgit v1.2.3


From 0f9f2e446dd9c28fa67e4c73a2f573b4c57cfc04 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:44:24 -0500
Subject: Clear timer variable

---
 test/test-database.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/test-database.js b/test/test-database.js
index 44f409dd..add04a03 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -109,7 +109,8 @@ function countKanjiWithCharacter(kanji, character) {
 
 function clearDatabase(timeout) {
     return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => {
+        let timer = setTimeout(() => {
+            timer = null;
             reject(new Error(`clearDatabase failed to resolve after ${timeout}ms`));
         }, timeout);
 
@@ -122,7 +123,9 @@ function clearDatabase(timeout) {
                     request.onsuccess = () => resolve2();
                 });
             }
-            clearTimeout(timer);
+            if (timer !== null) {
+                clearTimeout(timer);
+            }
             resolve();
         })();
     });
-- 
cgit v1.2.3


From f463e2e238b1616d58bf254ecb53de8b0dae6573 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:49:10 -0500
Subject: Update license strings to remove npm warning

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2bbc6a79..17fdfa82 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,10 @@
         "url": "git+https://github.com/FooSoft/yomichan.git"
     },
     "author": "FooSoft",
+    "license": "GPL-3.0-or-later",
     "licenses": [
         {
-            "type": "GPLv3",
+            "type": "GPL-3.0-or-later",
             "url": "https://www.gnu.org/licenses/gpl-3.0.html"
         }
     ],
-- 
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(-)

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


From 5a5c18371ca6df5473f9d5ef9a391acde6c2e168 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:58:17 -0500
Subject: Use textContent instead of innerText

---
 ext/bg/js/audio.js                         | 2 +-
 ext/bg/js/search-query-parser-generator.js | 6 +++---
 ext/fg/js/document.js                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js
index 0ecfd5c4..d300570b 100644
--- a/ext/bg/js/audio.js
+++ b/ext/bg/js/audio.js
@@ -52,7 +52,7 @@ const audioUrlBuilders = new Map([
         for (const row of dom.getElementsByClassName('dc-result-row')) {
             try {
                 const url = row.querySelector('audio>source[src]').getAttribute('src');
-                const reading = row.getElementsByClassName('dc-vocab_kana').item(0).innerText;
+                const reading = row.getElementsByClassName('dc-vocab_kana').item(0).textContent;
                 if (url && reading && (!definition.reading || definition.reading === reading)) {
                     return audioUrlNormalize(url, 'https://www.japanesepod101.com', '/learningcenter/reference/');
                 }
diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js
index f842644e..1ab23a82 100644
--- a/ext/bg/js/search-query-parser-generator.js
+++ b/ext/bg/js/search-query-parser-generator.js
@@ -50,7 +50,7 @@ class QueryParserGenerator {
         const segmentTextContainer = segmentContainer.querySelector('.query-parser-segment-text');
         const segmentReadingContainer = segmentContainer.querySelector('.query-parser-segment-reading');
         segmentTextContainer.appendChild(this.createSegmentText(segment.text));
-        segmentReadingContainer.innerText = segment.reading;
+        segmentReadingContainer.textContent = segment.reading;
         return segmentContainer;
     }
 
@@ -58,7 +58,7 @@ class QueryParserGenerator {
         const fragment = document.createDocumentFragment();
         for (const chr of text) {
             const charContainer = this._templateHandler.instantiate('char');
-            charContainer.innerText = chr;
+            charContainer.textContent = chr;
             fragment.appendChild(charContainer);
         }
         return fragment;
@@ -69,7 +69,7 @@ class QueryParserGenerator {
         for (const parseResult of parseResults) {
             const optionContainer = this._templateHandler.instantiate('select-option');
             optionContainer.value = parseResult.id;
-            optionContainer.innerText = parseResult.name;
+            optionContainer.textContent = parseResult.name;
             optionContainer.defaultSelected = selectedParser === parseResult.id;
             selectContainer.appendChild(optionContainer);
         }
diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index ea9ac965..1a3e8791 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -50,7 +50,7 @@ function docImposterCreate(element, isTextarea) {
     const imposter = document.createElement('div');
     const imposterStyle = imposter.style;
 
-    imposter.innerText = element.value;
+    imposter.textContent = element.value;
 
     for (let i = 0, ii = elementStyle.length; i < ii; ++i) {
         const property = elementStyle[i];
-- 
cgit v1.2.3


From 76976439669d31484b116df3ea4d9bbcbb485e32 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:59:57 -0500
Subject: Reject with a consistent error

---
 ext/bg/js/backend.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 2691b7d9..e3bf7bda 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -802,7 +802,7 @@ class Backend {
             chrome.tabs.update(tab.id, {active: true}, () => {
                 const e = chrome.runtime.lastError;
                 if (e) {
-                    reject(e);
+                    reject(new Error(e.message));
                 } else {
                     resolve();
                 }
@@ -819,7 +819,7 @@ class Backend {
                 chrome.windows.get(tab.windowId, {}, (value) => {
                     const e = chrome.runtime.lastError;
                     if (e) {
-                        reject(e);
+                        reject(new Error(e.message));
                     } else {
                         resolve(value);
                     }
@@ -830,7 +830,7 @@ class Backend {
                     chrome.windows.update(tab.windowId, {focused: true}, () => {
                         const e = chrome.runtime.lastError;
                         if (e) {
-                            reject(e);
+                            reject(new Error(e.message));
                         } else {
                             resolve();
                         }
-- 
cgit v1.2.3


From 0c4aa2eeb96a3d57555865576f9e5285d3c49fb7 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 13:04:55 -0500
Subject: Fix trailing newlines not actually generating a new line in the
 imposter

This was causing vertical scroll offset issues
---
 ext/fg/js/document.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index 1a3e8791..35861475 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -50,7 +50,9 @@ function docImposterCreate(element, isTextarea) {
     const imposter = document.createElement('div');
     const imposterStyle = imposter.style;
 
-    imposter.textContent = element.value;
+    let value = element.value;
+    if (value.endsWith('\n')) { value += '\n'; }
+    imposter.textContent = value;
 
     for (let i = 0, ii = elementStyle.length; i < ii; ++i) {
         const property = elementStyle[i];
-- 
cgit v1.2.3


From d87050bbbba6edb64f75e65b614526a3beef9105 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 13:05:48 -0500
Subject: Add missing copyright headers

---
 test/dictionary-validate.js | 18 ++++++++++++++++++
 test/schema-validate.js     | 18 ++++++++++++++++++
 test/test-database.js       | 18 ++++++++++++++++++
 test/test-dictionary.js     | 18 ++++++++++++++++++
 test/test-schema.js         | 18 ++++++++++++++++++
 test/yomichan-test.js       | 18 ++++++++++++++++++
 6 files changed, 108 insertions(+)

diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index 25a5de88..14eee2ed 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const fs = require('fs');
 const path = require('path');
 const yomichanTest = require('./yomichan-test');
diff --git a/test/schema-validate.js b/test/schema-validate.js
index 1271a611..a4f2d94c 100644
--- a/test/schema-validate.js
+++ b/test/schema-validate.js
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const fs = require('fs');
 const yomichanTest = require('./yomichan-test');
 
diff --git a/test/test-database.js b/test/test-database.js
index add04a03..c2317881 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const fs = require('fs');
 const url = require('url');
 const path = require('path');
diff --git a/test/test-dictionary.js b/test/test-dictionary.js
index b157dd5d..74f9e62b 100644
--- a/test/test-dictionary.js
+++ b/test/test-dictionary.js
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const yomichanTest = require('./yomichan-test');
 const dictionaryValidate = require('./dictionary-validate');
 
diff --git a/test/test-schema.js b/test/test-schema.js
index 8ca63167..f4612f86 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const assert = require('assert');
 const yomichanTest = require('./yomichan-test');
 
diff --git a/test/yomichan-test.js b/test/yomichan-test.js
index 939e0ad2..78bfb9c6 100644
--- a/test/yomichan-test.js
+++ b/test/yomichan-test.js
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const fs = require('fs');
 const path = require('path');
 
-- 
cgit v1.2.3


From a0b2e11c10f76844d37a3ebab1a2c8a0f4ab18a9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 16:18:13 -0500
Subject: Use TemplateHandler for DisplayGenerator

---
 ext/fg/float.html                 |  1 +
 ext/mixed/js/display-generator.js | 77 +++++++++------------------------------
 2 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/ext/fg/float.html b/ext/fg/float.html
index 082755f5..352a866a 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -51,6 +51,7 @@
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/js/display-generator.js"></script>
         <script src="/mixed/js/scroll.js"></script>
+        <script src="/mixed/js/template-handler.js"></script>
 
         <script src="/fg/js/float.js"></script>
 
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 46f3d17e..5023c191 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -16,23 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*global apiGetDisplayTemplatesHtml*/
+/*global apiGetDisplayTemplatesHtml, TemplateHandler*/
 
 class DisplayGenerator {
     constructor() {
-        this._termEntryTemplate = null;
-        this._termExpressionTemplate = null;
-        this._termDefinitionItemTemplate = null;
-        this._termDefinitionOnlyTemplate = null;
-        this._termGlossaryItemTemplate = null;
-        this._termReasonTemplate = null;
-
-        this._kanjiEntryTemplate = null;
-        this._kanjiInfoTableTemplate = null;
-        this._kanjiInfoTableItemTemplate = null;
-        this._kanjiInfoTableEmptyTemplate = null;
-        this._kanjiGlossaryItemTemplate = null;
-        this._kanjiReadingTemplate = null;
+        this._templateHandler = null;
 
         this._tagTemplate = null;
         this._tagFrequencyTemplate = null;
@@ -40,12 +28,11 @@ class DisplayGenerator {
 
     async prepare() {
         const html = await apiGetDisplayTemplatesHtml();
-        const doc = new DOMParser().parseFromString(html, 'text/html');
-        this._setTemplates(doc);
+        this._templateHandler = new TemplateHandler(html);
     }
 
     createTermEntry(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._termEntryTemplate);
+        const node = this._templateHandler.instantiate('term-entry');
 
         const expressionsContainer = node.querySelector('.term-expression-list');
         const reasonsContainer = node.querySelector('.term-reasons');
@@ -78,7 +65,7 @@ class DisplayGenerator {
     }
 
     createTermExpression([details, termTags]) {
-        const node = DisplayGenerator._instantiateTemplate(this._termExpressionTemplate);
+        const node = this._templateHandler.instantiate('term-expression');
 
         const expressionContainer = node.querySelector('.term-expression-text');
         const tagContainer = node.querySelector('.tags');
@@ -112,7 +99,7 @@ class DisplayGenerator {
     }
 
     createTermReason(reason) {
-        const fragment = DisplayGenerator._instantiateTemplateFragment(this._termReasonTemplate);
+        const fragment = this._templateHandler.instantiateFragment('term-reason');
         const node = fragment.querySelector('.term-reason');
         node.textContent = reason;
         node.dataset.reason = reason;
@@ -120,7 +107,7 @@ class DisplayGenerator {
     }
 
     createTermDefinitionItem(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._termDefinitionItemTemplate);
+        const node = this._templateHandler.instantiate('term-definition-item');
 
         const tagListContainer = node.querySelector('.term-definition-tag-list');
         const onlyListContainer = node.querySelector('.term-definition-only-list');
@@ -136,7 +123,7 @@ class DisplayGenerator {
     }
 
     createTermGlossaryItem(glossary) {
-        const node = DisplayGenerator._instantiateTemplate(this._termGlossaryItemTemplate);
+        const node = this._templateHandler.instantiate('term-glossary-item');
         const container = node.querySelector('.term-glossary');
         if (container !== null) {
             DisplayGenerator._appendMultilineText(container, glossary);
@@ -145,7 +132,7 @@ class DisplayGenerator {
     }
 
     createTermOnly(only) {
-        const node = DisplayGenerator._instantiateTemplate(this._termDefinitionOnlyTemplate);
+        const node = this._templateHandler.instantiate('term-definition-only');
         node.dataset.only = only;
         node.textContent = only;
         return node;
@@ -160,7 +147,7 @@ class DisplayGenerator {
     }
 
     createKanjiEntry(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._kanjiEntryTemplate);
+        const node = this._templateHandler.instantiate('kanji-entry');
 
         const glyphContainer = node.querySelector('.kanji-glyph');
         const frequenciesContainer = node.querySelector('.frequencies');
@@ -205,7 +192,7 @@ class DisplayGenerator {
     }
 
     createKanjiGlossaryItem(glossary) {
-        const node = DisplayGenerator._instantiateTemplate(this._kanjiGlossaryItemTemplate);
+        const node = this._templateHandler.instantiate('kanji-glossary-item');
         const container = node.querySelector('.kanji-glossary');
         if (container !== null) {
             DisplayGenerator._appendMultilineText(container, glossary);
@@ -214,13 +201,13 @@ class DisplayGenerator {
     }
 
     createKanjiReading(reading) {
-        const node = DisplayGenerator._instantiateTemplate(this._kanjiReadingTemplate);
+        const node = this._templateHandler.instantiate('kanji-reading');
         node.textContent = reading;
         return node;
     }
 
     createKanjiInfoTable(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._kanjiInfoTableTemplate);
+        const node = this._templateHandler.instantiate('kanji-info-table');
 
         const container = node.querySelector('.kanji-info-table-body');
 
@@ -236,7 +223,7 @@ class DisplayGenerator {
     }
 
     createKanjiInfoTableItem(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._kanjiInfoTableItemTemplate);
+        const node = this._templateHandler.instantiate('kanji-info-table-item');
         const nameNode = node.querySelector('.kanji-info-table-item-header');
         const valueNode = node.querySelector('.kanji-info-table-item-value');
         if (nameNode !== null) {
@@ -249,11 +236,11 @@ class DisplayGenerator {
     }
 
     createKanjiInfoTableItemEmpty() {
-        return DisplayGenerator._instantiateTemplate(this._kanjiInfoTableEmptyTemplate);
+        return this._templateHandler.instantiate('kanji-info-table-empty');
     }
 
     createTag(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._tagTemplate);
+        const node = this._templateHandler.instantiate('tag');
 
         const inner = node.querySelector('.tag-inner');
 
@@ -265,7 +252,7 @@ class DisplayGenerator {
     }
 
     createSearchTag(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._tagSearchTemplate);
+        const node = this._templateHandler.instantiate('tag-search');
 
         node.textContent = details.query;
 
@@ -275,7 +262,7 @@ class DisplayGenerator {
     }
 
     createFrequencyTag(details) {
-        const node = DisplayGenerator._instantiateTemplate(this._tagFrequencyTemplate);
+        const node = this._templateHandler.instantiate('tag-frequency');
 
         let n = node.querySelector('.term-frequency-dictionary-name');
         if (n !== null) {
@@ -293,26 +280,6 @@ class DisplayGenerator {
         return node;
     }
 
-    _setTemplates(doc) {
-        this._termEntryTemplate = doc.querySelector('#term-entry-template');
-        this._termExpressionTemplate = doc.querySelector('#term-expression-template');
-        this._termDefinitionItemTemplate = doc.querySelector('#term-definition-item-template');
-        this._termDefinitionOnlyTemplate = doc.querySelector('#term-definition-only-template');
-        this._termGlossaryItemTemplate = doc.querySelector('#term-glossary-item-template');
-        this._termReasonTemplate = doc.querySelector('#term-reason-template');
-
-        this._kanjiEntryTemplate = doc.querySelector('#kanji-entry-template');
-        this._kanjiInfoTableTemplate = doc.querySelector('#kanji-info-table-template');
-        this._kanjiInfoTableItemTemplate = doc.querySelector('#kanji-info-table-item-template');
-        this._kanjiInfoTableEmptyTemplate = doc.querySelector('#kanji-info-table-empty-template');
-        this._kanjiGlossaryItemTemplate = doc.querySelector('#kanji-glossary-item-template');
-        this._kanjiReadingTemplate = doc.querySelector('#kanji-reading-template');
-
-        this._tagTemplate = doc.querySelector('#tag-template');
-        this._tagSearchTemplate = doc.querySelector('#tag-search-template');
-        this._tagFrequencyTemplate = doc.querySelector('#tag-frequency-template');
-    }
-
     _appendKanjiLinks(container, text) {
         let part = '';
         for (const c of text) {
@@ -382,12 +349,4 @@ class DisplayGenerator {
             container.appendChild(document.createTextNode(parts[i]));
         }
     }
-
-    static _instantiateTemplate(template) {
-        return document.importNode(template.content.firstChild, true);
-    }
-
-    static _instantiateTemplateFragment(template) {
-        return document.importNode(template.content, true);
-    }
 }
-- 
cgit v1.2.3


From d6454bc999b2bbefc95b3b68c19e70569665f527 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 16:21:52 -0500
Subject: Remove unused

---
 ext/mixed/js/display-generator.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 5023c191..d7e77cc0 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -21,9 +21,6 @@
 class DisplayGenerator {
     constructor() {
         this._templateHandler = null;
-
-        this._tagTemplate = null;
-        this._tagFrequencyTemplate = null;
     }
 
     async prepare() {
-- 
cgit v1.2.3


From 15f79bc78b69ee808b99983861e21594ba30bb10 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 Feb 2020 21:12:43 -0500
Subject: Fix popupScalingFactor being limited to integer values

---
 ext/bg/js/settings/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index c6683427..d1ad2c6b 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -68,7 +68,7 @@ async function formRead(options) {
     options.general.popupVerticalOffset = parseInt($('#popup-vertical-offset').val(), 10);
     options.general.popupHorizontalOffset2 = parseInt($('#popup-horizontal-offset2').val(), 0);
     options.general.popupVerticalOffset2 = parseInt($('#popup-vertical-offset2').val(), 10);
-    options.general.popupScalingFactor = parseInt($('#popup-scaling-factor').val(), 10);
+    options.general.popupScalingFactor = parseFloat($('#popup-scaling-factor').val());
     options.general.popupScaleRelativeToPageZoom = $('#popup-scale-relative-to-page-zoom').prop('checked');
     options.general.popupScaleRelativeToVisualViewport = $('#popup-scale-relative-to-visual-viewport').prop('checked');
     options.general.popupTheme = $('#popup-theme').val();
-- 
cgit v1.2.3


From ffad78f7d480cb49a43af0db8b25d731be423f1a Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 24 Feb 2020 08:57:48 +0200
Subject: temporarily disable navigation header mouse wheel

Unblock release #355, #376
---
 ext/mixed/js/display.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 8113260c..5d3076ee 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -303,7 +303,7 @@ class Display {
         if (interactive) {
             const actionPrevious = document.querySelector('.action-previous');
             const actionNext = document.querySelector('.action-next');
-            const navigationHeader = document.querySelector('.navigation-header');
+            // const navigationHeader = document.querySelector('.navigation-header');
 
             this.persistentEventListeners.addEventListener(document, 'keydown', this.onKeyDown.bind(this), false);
             this.persistentEventListeners.addEventListener(document, 'wheel', this.onWheel.bind(this), {passive: false});
@@ -313,9 +313,10 @@ class Display {
             if (actionNext !== null) {
                 this.persistentEventListeners.addEventListener(actionNext, 'click', this.onNextTermView.bind(this));
             }
-            if (navigationHeader !== null) {
-                this.persistentEventListeners.addEventListener(navigationHeader, 'wheel', this.onHistoryWheel.bind(this), {passive: false});
-            }
+            // temporarily disabled
+            // if (navigationHeader !== null) {
+            //     this.persistentEventListeners.addEventListener(navigationHeader, 'wheel', this.onHistoryWheel.bind(this), {passive: false});
+            // }
         } else {
             this.persistentEventListeners.removeAllEventListeners();
         }
-- 
cgit v1.2.3


From 706c3edcffb0078d71fd5b58775f16cf5fc1205b Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 24 Feb 2020 21:30:37 -0800
Subject: version bump

---
 ext/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/manifest.json b/ext/manifest.json
index b86459f9..09e89729 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Yomichan",
-    "version": "20.1.26.0",
+    "version": "20.2.24.0",
 
     "description": "Japanese dictionary with Anki integration",
     "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
-- 
cgit v1.2.3