From d57c5530b7ad56a7cc89782b4d186d8fddb55d86 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 1 Jul 2017 18:27:49 -0700
Subject: view added notes

---
 ext/bg/js/anki-connect.js   | 16 ++++++++++------
 ext/bg/js/anki-null.js      |  4 ++++
 ext/bg/js/display-window.js |  4 ++++
 ext/bg/js/templates.js      | 12 ++++++------
 ext/bg/js/yomichan.js       |  8 ++++++++
 5 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
index 9759c8f5..173feefd 100644
--- a/ext/bg/js/anki-connect.js
+++ b/ext/bg/js/anki-connect.js
@@ -26,7 +26,7 @@ class AnkiConnect {
     }
 
     addNote(note) {
-        return this.checkVersion().then(() => this.ankiInvoke('addNote', {note}, null));
+        return this.checkVersion().then(() => this.ankiInvoke('addNote', {note}));
     }
 
     canAddNotes(notes) {
@@ -34,15 +34,19 @@ class AnkiConnect {
     }
 
     getDeckNames() {
-        return this.checkVersion().then(() => this.ankiInvoke('deckNames', {}, null));
+        return this.checkVersion().then(() => this.ankiInvoke('deckNames', {}));
     }
 
     getModelNames() {
-        return this.checkVersion().then(() => this.ankiInvoke('modelNames', {}, null));
+        return this.checkVersion().then(() => this.ankiInvoke('modelNames', {}));
     }
 
     getModelFieldNames(modelName) {
-        return this.checkVersion().then(() => this.ankiInvoke('modelFieldNames', {modelName}, null));
+        return this.checkVersion().then(() => this.ankiInvoke('modelFieldNames', {modelName}));
+    }
+
+    guiBrowse(query) {
+        return this.checkVersion().then(() => this.ankiInvoke('guiBrowse', {query}));
     }
 
     checkVersion() {
@@ -60,13 +64,13 @@ class AnkiConnect {
 
     ankiInvoke(action, params, pool) {
         return new Promise((resolve, reject) => {
-            if (pool !== null && this.asyncPools.hasOwnProperty(pool)) {
+            if (pool && this.asyncPools.hasOwnProperty(pool)) {
                 this.asyncPools[pool].abort();
             }
 
             const xhr = new XMLHttpRequest();
             xhr.addEventListener('loadend', () => {
-                if (pool !== null) {
+                if (pool) {
                     delete this.asyncPools[pool];
                 }
 
diff --git a/ext/bg/js/anki-null.js b/ext/bg/js/anki-null.js
index 99dc2f30..8dad6915 100644
--- a/ext/bg/js/anki-null.js
+++ b/ext/bg/js/anki-null.js
@@ -37,4 +37,8 @@ class AnkiNull {
     getModelFieldNames(modelName) {
         return Promise.resolve([]);
     }
+
+    guiBrowse(query) {
+        return Promise.resolve([]);
+    }
 }
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
index ae97cd36..64e56f72 100644
--- a/ext/bg/js/display-window.js
+++ b/ext/bg/js/display-window.js
@@ -37,6 +37,10 @@ window.displayWindow = new class extends Display {
         return instYomi().definitionsAddable(definitions, modes).catch(() => []);
     }
 
+    noteView(noteId) {
+        return instYomi().noteView(noteId);
+    }
+
     templateRender(template, data) {
         return instYomi().templateRender(template, data);
     }
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f10134ee..50686ed4 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -315,10 +315,10 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {};
 
-  return "<div class=\"entry\" data-type=\"kanji\">\n    <div class=\"actions\">\n        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n"
+  return "<div class=\"entry\" data-type=\"kanji\">\n    <div class=\"actions\">\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.source : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n    <div class=\"glyph\">"
+    + "        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n    </div>\n\n    <div class=\"glyph\">"
     + container.escapeExpression(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper)))
     + "</div>\n\n    <div class=\"reading\">\n        <table>\n            <tr>\n                <th>Kunyomi:</th>\n                <td>\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -332,7 +332,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"2":function(container,depth0,helpers,partials,data) {
-    return "        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"kanji\"><img src=\"/mixed/img/add-kanji.png\" title=\"Add Kanji (Alt + K)\" alt></a>\n";
+    return "        <a href=\"#\" class=\"action-view-note pending disabled\"><img src=\"/mixed/img/view-note.png\" title=\"View added note (Alt + V)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"kanji\"><img src=\"/mixed/img/add-kanji.png\" title=\"Add Kanji (Alt + K)\" alt></a>\n";
 },"4":function(container,depth0,helpers,partials,data) {
     return "        <a href=\"#\" class=\"source-term\"><img src=\"/mixed/img/source-term.png\" title=\"Source term (Alt + B)\" alt></a>\n";
 },"6":function(container,depth0,helpers,partials,data) {
@@ -486,10 +486,10 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"12":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=depth0 != null ? depth0 : {};
 
-  return "<div class=\"entry\" data-type=\"term\">\n    <div class=\"actions\">\n        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n"
+  return "<div class=\"entry\" data-type=\"term\">\n    <div class=\"actions\">\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.playback : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n"
+    + "        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n    </div>\n\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(20, data, 0),"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"if","hash":{},"fn":container.program(22, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -499,7 +499,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"13":function(container,depth0,helpers,partials,data) {
-    return "        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\"><img src=\"/mixed/img/add-term-kanji.png\" title=\"Add expression (Alt + E)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\"><img src=\"/mixed/img/add-term-kana.png\" title=\"Add reading (Alt + R)\" alt></a>\n";
+    return "        <a href=\"#\" class=\"action-view-note pending disabled\"><img src=\"/mixed/img/view-note.png\" title=\"View added note (Alt + V)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\"><img src=\"/mixed/img/add-term-kanji.png\" title=\"Add expression (Alt + E)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\"><img src=\"/mixed/img/add-term-kana.png\" title=\"Add reading (Alt + R)\" alt></a>\n";
 },"15":function(container,depth0,helpers,partials,data) {
     return "        <a href=\"#\" class=\"action-play-audio\"><img src=\"/mixed/img/play-audio.png\" title=\"Play audio (Alt + P)\" alt></a>\n";
 },"17":function(container,depth0,helpers,partials,data) {
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
index b4beb179..e0bdabc3 100644
--- a/ext/bg/js/yomichan.js
+++ b/ext/bg/js/yomichan.js
@@ -157,6 +157,10 @@ window.yomichan = new class {
         });
     }
 
+    noteView(noteId) {
+        return this.anki.guiBrowse(`nid:${noteId}`);
+    }
+
     templateRender(template, data) {
         return Promise.resolve(handlebarsRender(template, data));
     }
@@ -211,6 +215,10 @@ window.yomichan = new class {
 
             definitionsAddable: ({definitions, modes, callback}) => {
                 promiseCallback(this.definitionsAddable(definitions, modes), callback);
+            },
+
+            noteView: ({noteId}) => {
+                promiseCallback(this.noteView(noteId), callback);
             }
         };
 
-- 
cgit v1.2.3


From b3984ccd54340195fc352033f61d33e4b5f492ea Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 9 Jul 2017 15:23:11 -0700
Subject: cleanup

---
 ext/bg/js/database.js | 14 +++++++-------
 ext/bg/js/options.js  |  2 +-
 ext/fg/js/util.js     | 18 +++++++-----------
 3 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 70aeb0d7..400ebd6a 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -35,7 +35,7 @@ class Database {
     }
 
     prepare() {
-        if (this.db !== null) {
+        if (!this.db) {
             return Promise.reject('database already initialized');
         }
 
@@ -53,7 +53,7 @@ class Database {
     }
 
     purge() {
-        if (this.db === null) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
@@ -66,7 +66,7 @@ class Database {
     }
 
     findTerms(term, dictionaries) {
-        if (this.db === null) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
@@ -96,7 +96,7 @@ class Database {
     }
 
     findKanji(kanji, dictionaries) {
-        if (this.db === null) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
@@ -124,7 +124,7 @@ class Database {
     }
 
     cacheTagMeta(dictionaries) {
-        if (this.db === null) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
@@ -148,7 +148,7 @@ class Database {
     }
 
     getDictionaries() {
-        if (this.db === null) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
@@ -156,7 +156,7 @@ class Database {
     }
 
     importDictionary(archive, callback) {
-        if (this.db === null) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 5aa18366..728ddae4 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -337,7 +337,7 @@ function ankiFieldsPopulate(element, options) {
     const container = tab.find('tbody').empty();
 
     const modelName = element.val();
-    if (modelName === null) {
+    if (!modelName) {
         return Promise.resolve();
     }
 
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index e1b0e080..2acd81c4 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -117,7 +117,7 @@ function docImposterDestroy() {
 
 function docRangeFromPoint(point) {
     const element = document.elementFromPoint(point.x, point.y);
-    if (element !== null) {
+    if (element) {
         if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
             return new TextSourceElement(element);
         } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
@@ -128,23 +128,19 @@ function docRangeFromPoint(point) {
     if (!document.caretRangeFromPoint) {
         document.caretRangeFromPoint = (x, y) => {
             const position = document.caretPositionFromPoint(x,y);
-            if (position === null) {
-                return null;
+            if (position) {
+                const range = document.createRange();
+                range.setStart(position.offsetNode, position.offset);
+                range.setEnd(position.offsetNode, position.offset);
+                return range;
             }
-
-            const range = document.createRange();
-            range.setStart(position.offsetNode, position.offset);
-            range.setEnd(position.offsetNode, position.offset);
-            return range;
         };
     }
 
     const range = document.caretRangeFromPoint(point.x, point.y);
-    if (range !== null) {
+    if (range) {
         return new TextSourceRange(range);
     }
-
-    return null;
 }
 
 function docSentenceExtract(source, extent) {
-- 
cgit v1.2.3


From 6e986bf1f5957be12ad610c627060f4d86eca98c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 9 Jul 2017 16:29:52 -0700
Subject: cleanup

---
 ext/bg/js/database.js   | 2 +-
 ext/bg/js/translator.js | 2 +-
 ext/bg/js/util.js       | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 400ebd6a..69a3bbdd 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -35,7 +35,7 @@ class Database {
     }
 
     prepare() {
-        if (!this.db) {
+        if (this.db) {
             return Promise.reject('database already initialized');
         }
 
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 8d65a0cd..f1858247 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -53,7 +53,7 @@ class Translator {
         }
 
         return this.findTermsDeinflected(text, titles, cache).then(deinfLiteral => {
-            const textHiragana = wanakana._katakanaToHiragana(text);
+            const textHiragana = jpKatakanaToHiragana(text);
             if (text === textHiragana) {
                 return deinfLiteral;
             } else {
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index cdd5ec31..b39b4b2f 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -43,6 +43,10 @@ function jpIsKana(c) {
     return wanakana.isKana(c);
 }
 
+function jpKatakanaToHiragana(text) {
+    return wanakana._katakanaToHiragana(text);
+}
+
 
 /*
  * Commands
-- 
cgit v1.2.3


From f49a69c993425cce57aea16e19adab378f8cbba9 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 13:16:24 -0700
Subject: move database to use async

---
 ext/bg/js/database.js | 200 +++++++++++++++++++++++++-------------------------
 1 file changed, 98 insertions(+), 102 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 69a3bbdd..06312438 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -20,58 +20,62 @@
 class Database {
     constructor() {
         this.db = null;
-        this.dbVersion = 2;
-        this.tagMetaCache = {};
+        this.version = 2;
+        this.tagCache = {};
     }
 
-    sanitize() {
-        const db = new Dexie('dict');
-        return db.open().then(() => {
+    async sanitize() {
+        try {
+            const db = new Dexie('dict');
+            await db.open();
             db.close();
-            if (db.verno !== this.dbVersion) {
-                return db.delete();
+            if (db.verno !== this.version) {
+                await db.delete();
             }
-        }).catch(() => {});
+        }
+        catch(error) {
+            // NOP
+        }
     }
 
-    prepare() {
+    async prepare() {
         if (this.db) {
-            return Promise.reject('database already initialized');
+            throw 'database already initialized';
         }
 
-        return this.sanitize().then(() => {
-            this.db = new Dexie('dict');
-            this.db.version(this.dbVersion).stores({
-                terms: '++id,dictionary,expression,reading',
-                kanji: '++,dictionary,character',
-                tagMeta: '++,dictionary',
-                dictionaries: '++,title,version'
-            });
+        await this.sanitize();
 
-            return this.db.open();
+        this.db = new Dexie('dict');
+        this.db.version(this.version).stores({
+            terms: '++id,dictionary,expression,reading',
+            kanji: '++,dictionary,character',
+            tagMeta: '++,dictionary',
+            dictionaries: '++,title,version'
         });
+
+        await this.db.open();
     }
 
-    purge() {
+    async purge() {
         if (!this.db) {
-            return Promise.reject('database not initialized');
+            throw 'database not initialized';
         }
 
         this.db.close();
-        return this.db.delete().then(() => {
-            this.db = null;
-            this.tagMetaCache = {};
-            return this.prepare();
-        });
+        await this.db.delete();
+        this.db = null;
+        this.tagCache = {};
+
+        await this.prepare();
     }
 
-    findTerms(term, dictionaries) {
+    async findTerms(term, dictionaries) {
         if (!this.db) {
-            return Promise.reject('database not initialized');
+            throw 'database not initialized';
         }
 
         const results = [];
-        return this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
+        await this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
             if (dictionaries.includes(row.dictionary)) {
                 results.push({
                     expression: row.expression,
@@ -84,24 +88,23 @@ class Database {
                     id: row.id
                 });
             }
-        }).then(() => {
-            return this.cacheTagMeta(dictionaries);
-        }).then(() => {
-            for (const result of results) {
-                result.tagMeta = this.tagMetaCache[result.dictionary] || {};
-            }
-
-            return results;
         });
+
+        await this.cacheTagMeta(dictionaries);
+        for (const result of results) {
+            result.tagMeta = this.tagCache[result.dictionary] || {};
+        }
+
+        return results;
     }
 
-    findKanji(kanji, dictionaries) {
+    async findKanji(kanji, dictionaries) {
         if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
         const results = [];
-        return this.db.kanji.where('character').equals(kanji).each(row => {
+        await this.db.kanji.where('character').equals(kanji).each(row => {
             if (dictionaries.includes(row.dictionary)) {
                 results.push({
                     character: row.character,
@@ -112,83 +115,79 @@ class Database {
                     dictionary: row.dictionary
                 });
             }
-        }).then(() => {
-            return this.cacheTagMeta(dictionaries);
-        }).then(() => {
-            for (const result of results) {
-                result.tagMeta = this.tagMetaCache[result.dictionary] || {};
-            }
-
-            return results;
         });
+
+        await this.cacheTagMeta(dictionaries);
+        for (const result of results) {
+            result.tagMeta = this.tagCache[result.dictionary] || {};
+        }
+
+        return results;
     }
 
-    cacheTagMeta(dictionaries) {
+    async cacheTagMeta(dictionaries) {
         if (!this.db) {
-            return Promise.reject('database not initialized');
+            throw 'database not initialized';
         }
 
-        const promises = [];
         for (const dictionary of dictionaries) {
-            if (this.tagMetaCache[dictionary]) {
-                continue;
-            }
-
-            const tagMeta = {};
-            promises.push(
-                this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
+            if (!this.tagCache[dictionary]) {
+                const tagMeta = {};
+                await this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
                     tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
-                }).then(() => {
-                    this.tagMetaCache[dictionary] = tagMeta;
-                })
-            );
-        }
+                });
 
-        return Promise.all(promises);
+                this.tagCache[dictionary] = tagMeta;
+            }
+        }
     }
 
-    getDictionaries() {
+    async getDictionaries() {
         if (!this.db) {
-            return Promise.reject('database not initialized');
+            throw 'database not initialized';
         }
 
         return this.db.dictionaries.toArray();
     }
 
-    importDictionary(archive, callback) {
+    async importDictionary(archive, callback) {
         if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
         let summary = null;
-        const indexLoaded = (title, version, revision, tagMeta, hasTerms, hasKanji) => {
+        const indexLoaded = async (title, version, revision, tagMeta, hasTerms, hasKanji) => {
             summary = {title, version, revision, hasTerms, hasKanji};
-            return this.db.dictionaries.where('title').equals(title).count().then(count => {
-                if (count > 0) {
-                    return Promise.reject(`dictionary "${title}" is already imported`);
-                }
-
-                return this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji}).then(() => {
-                    const rows = [];
-                    for (const tag in tagMeta || {}) {
-                        const meta = tagMeta[tag];
-                        const row = dictTagSanitize({
-                            name: tag,
-                            category: meta.category,
-                            notes: meta.notes,
-                            order: meta.order,
-                            dictionary: title
-                        });
-
-                        rows.push(row);
-                    }
-
-                    return this.db.tagMeta.bulkAdd(rows);
+
+            const count = await this.db.dictionaries.where('title').equals(title).count();
+            if (count > 0) {
+                throw `dictionary "${title}" is already imported`;
+            }
+
+            await this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji});
+
+            const rows = [];
+            for (const tag in tagMeta || {}) {
+                const meta = tagMeta[tag];
+                const row = dictTagSanitize({
+                    name: tag,
+                    category: meta.category,
+                    notes: meta.notes,
+                    order: meta.order,
+                    dictionary: title
                 });
-            });
+
+                rows.push(row);
+            }
+
+            await this.db.tagMeta.bulkAdd(rows);
         };
 
-        const termsLoaded = (title, entries, total, current) => {
+        const termsLoaded = async (title, entries, total, current) => {
+            if (callback) {
+                callback(total, current);
+            }
+
             const rows = [];
             for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
                 rows.push({
@@ -202,14 +201,14 @@ class Database {
                 });
             }
 
-            return this.db.terms.bulkAdd(rows).then(() => {
-                if (callback) {
-                    callback(total, current);
-                }
-            });
+            await this.db.terms.bulkAdd(rows);
         };
 
-        const kanjiLoaded = (title, entries, total, current)  => {
+        const kanjiLoaded = async (title, entries, total, current)  => {
+            if (callback) {
+                callback(total, current);
+            }
+
             const rows = [];
             for (const [character, onyomi, kunyomi, tags, ...meanings] of entries) {
                 rows.push({
@@ -222,13 +221,10 @@ class Database {
                 });
             }
 
-            return this.db.kanji.bulkAdd(rows).then(() => {
-                if (callback) {
-                    callback(total, current);
-                }
-            });
+            await this.db.kanji.bulkAdd(rows);
         };
 
-        return zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded).then(() => summary);
+        await zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded);
+        return summary;
     }
 }
-- 
cgit v1.2.3


From b6f3919ef63f969769fbf030e8fd8b14b0e1c214 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 14:10:58 -0700
Subject: move translator to async

---
 ext/bg/js/database.js   |  28 ++++-----
 ext/bg/js/translator.js | 160 ++++++++++++++++++++----------------------------
 2 files changed, 80 insertions(+), 108 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 06312438..9eed8ea3 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -69,14 +69,14 @@ class Database {
         await this.prepare();
     }
 
-    async findTerms(term, dictionaries) {
+    async findTerms(term, titles) {
         if (!this.db) {
             throw 'database not initialized';
         }
 
         const results = [];
         await this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
-            if (dictionaries.includes(row.dictionary)) {
+            if (titles.includes(row.dictionary)) {
                 results.push({
                     expression: row.expression,
                     reading: row.reading,
@@ -90,7 +90,7 @@ class Database {
             }
         });
 
-        await this.cacheTagMeta(dictionaries);
+        await this.cacheTagMeta(titles);
         for (const result of results) {
             result.tagMeta = this.tagCache[result.dictionary] || {};
         }
@@ -98,14 +98,14 @@ class Database {
         return results;
     }
 
-    async findKanji(kanji, dictionaries) {
+    async findKanji(kanji, titles) {
         if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
         const results = [];
         await this.db.kanji.where('character').equals(kanji).each(row => {
-            if (dictionaries.includes(row.dictionary)) {
+            if (titles.includes(row.dictionary)) {
                 results.push({
                     character: row.character,
                     onyomi: dictFieldSplit(row.onyomi),
@@ -117,7 +117,7 @@ class Database {
             }
         });
 
-        await this.cacheTagMeta(dictionaries);
+        await this.cacheTagMeta(titles);
         for (const result of results) {
             result.tagMeta = this.tagCache[result.dictionary] || {};
         }
@@ -125,29 +125,29 @@ class Database {
         return results;
     }
 
-    async cacheTagMeta(dictionaries) {
+    async cacheTagMeta(titles) {
         if (!this.db) {
             throw 'database not initialized';
         }
 
-        for (const dictionary of dictionaries) {
-            if (!this.tagCache[dictionary]) {
+        for (const title of titles) {
+            if (!this.tagCache[title]) {
                 const tagMeta = {};
-                await this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
+                await this.db.tagMeta.where('dictionary').equals(title).each(row => {
                     tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
                 });
 
-                this.tagCache[dictionary] = tagMeta;
+                this.tagCache[title] = tagMeta;
             }
         }
     }
 
     async getDictionaries() {
-        if (!this.db) {
+        if (this.db) {
+            return this.db.dictionaries.toArray();
+        } else {
             throw 'database not initialized';
         }
-
-        return this.db.dictionaries.toArray();
     }
 
     async importDictionary(archive, callback) {
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index f1858247..35b49608 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -19,135 +19,107 @@
 
 class Translator {
     constructor() {
-        this.loaded = false;
-        this.ruleMeta = null;
         this.database = new Database();
         this.deinflector = new Deinflector();
+        this.loaded = false;
     }
 
-    prepare() {
-        if (this.loaded) {
-            return Promise.resolve();
-        }
-
-        const promises = [
-            jsonLoadInt('/bg/lang/deinflect.json'),
-            this.database.prepare()
-        ];
-
-        return Promise.all(promises).then(([reasons]) => {
+    async prepare() {
+        if (!this.loaded) {
+            const reasons = await jsonLoadInt('/bg/lang/deinflect.json');
             this.deinflector.setReasons(reasons);
+            await this.database.prepare();
             this.loaded = true;
-        });
+        }
     }
 
-    findTerms(text, dictionaries, alphanumeric) {
-        const titles = Object.keys(dictionaries);
-        const cache = {};
+    async findTermsGrouped(text, dictionaries, alphanumeric) {
+        const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
+        return {length, definitions: dictTermsGroup(definitions, dictionaries)};
+    }
 
+    async findTerms(text, dictionaries, alphanumeric) {
         if (!alphanumeric && text.length > 0) {
             const c = text[0];
             if (!jpIsKana(c) && !jpIsKanji(c)) {
-                return Promise.resolve({length: 0, definitions: []});
+                return {length: 0, definitions: []};
             }
         }
 
-        return this.findTermsDeinflected(text, titles, cache).then(deinfLiteral => {
-            const textHiragana = jpKatakanaToHiragana(text);
-            if (text === textHiragana) {
-                return deinfLiteral;
-            } else {
-                return this.findTermsDeinflected(textHiragana, titles, cache).then(deinfHiragana => deinfLiteral.concat(deinfHiragana));
-            }
-        }).then(deinflections => {
-            let definitions = [];
-            for (const deinflection of deinflections) {
-                for (const definition of deinflection.definitions) {
-                    const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
-                    tags.push(dictTagBuildSource(definition.dictionary));
-                    definitions.push({
-                        source: deinflection.source,
-                        reasons: deinflection.reasons,
-                        score: definition.score,
-                        id: definition.id,
-                        dictionary: definition.dictionary,
-                        expression: definition.expression,
-                        reading: definition.reading,
-                        glossary: definition.glossary,
-                        tags: dictTagsSort(tags)
-                    });
-                }
-            }
-
-            definitions = dictTermsUndupe(definitions);
-            definitions = dictTermsSort(definitions, dictionaries);
-
-            let length = 0;
-            for (const definition of definitions) {
-                length = Math.max(length, definition.source.length);
-            }
-
-            return {length, definitions};
-        });
-    }
-
-    findTermsGrouped(text, dictionaries, alphanumeric) {
-        return this.findTerms(text, dictionaries, alphanumeric).then(({length, definitions}) => {
-            return {length, definitions: dictTermsGroup(definitions, dictionaries)};
-        });
-    }
-
-    findKanji(text, dictionaries) {
+        const cache = {};
         const titles = Object.keys(dictionaries);
-        const processed = {};
-        const promises = [];
-
-        for (const c of text) {
-            if (!processed[c]) {
-                promises.push(this.database.findKanji(c, titles));
-                processed[c] = true;
-            }
+        let deinflections = await this.findTermsDeinflected(text, titles, cache);
+        const textHiragana = jpKatakanaToHiragana(text);
+        if (text !== textHiragana) {
+            deinflections = deinflections.concat(await this.findTermsDeinflected(textHiragana, titles, cache));
         }
 
-        return Promise.all(promises).then(defSets => {
-            const definitions = defSets.reduce((a, b) => a.concat(b), []);
-            for (const definition of definitions) {
+        let definitions = [];
+        for (const deinflection of deinflections) {
+            for (const definition of deinflection.definitions) {
                 const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
                 tags.push(dictTagBuildSource(definition.dictionary));
-                definition.tags = dictTagsSort(tags);
+                definitions.push({
+                    source: deinflection.source,
+                    reasons: deinflection.reasons,
+                    score: definition.score,
+                    id: definition.id,
+                    dictionary: definition.dictionary,
+                    expression: definition.expression,
+                    reading: definition.reading,
+                    glossary: definition.glossary,
+                    tags: dictTagsSort(tags)
+                });
             }
+        }
+
+        definitions = dictTermsUndupe(definitions);
+        definitions = dictTermsSort(definitions, dictionaries);
 
-            return definitions;
-        });
+        let length = 0;
+        for (const definition of definitions) {
+            length = Math.max(length, definition.source.length);
+        }
+
+        return {length, definitions};
     }
 
-    findTermsDeinflected(text, dictionaries, cache) {
-        const definer = term => {
+    async findTermsDeinflected(text, dictionaries, cache) {
+        await this.prepare();
+
+        const definer = async term => {
             if (cache.hasOwnProperty(term)) {
-                return Promise.resolve(cache[term]);
+                return cache[term];
+            } else {
+                return cache[term] = await this.database.findTerms(term, dictionaries);
             }
-
-            return this.database.findTerms(term, dictionaries).then(definitions => cache[term] = definitions);
         };
 
-        const promises = [];
+        let deinflections = [];
         for (let i = text.length; i > 0; --i) {
-            promises.push(this.deinflector.deinflect(text.slice(0, i), definer));
+            const textSlice = text.slice(0, i);
+            deinflections = deinflections.concat(await this.deinflector.deinflect(textSlice, definer));
         }
 
-        return Promise.all(promises).then(results => {
-            let deinflections = [];
-            for (const result of results) {
-                deinflections = deinflections.concat(result);
-            }
-
-            return deinflections;
-        });
+        return deinflections;
     }
 
-    processKanji(definitions) {
+    async findKanji(text, dictionaries) {
+        await this.prepare();
+
+        let definitions = [];
+        const processed = {};
+        const titles = Object.keys(dictionaries);
+        for (const c of text) {
+            if (!processed[c]) {
+                definitions = definitions.concat(await this.database.findKanji(c, titles));
+                processed[c] = true;
+            }
+        }
+
         for (const definition of definitions) {
             const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
+            tags.push(dictTagBuildSource(definition.dictionary));
             definition.tags = dictTagsSort(tags);
         }
 
-- 
cgit v1.2.3


From 49352c5fa1baea4a6ed7d71d1353c13a56b00bca Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 14:30:34 -0700
Subject: move deinflector to async

---
 ext/bg/js/deinflector.js | 64 +++++++++++++++++++++---------------------------
 ext/bg/js/translator.js  | 16 ++++++------
 2 files changed, 37 insertions(+), 43 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index 6484f953..8b67761b 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -26,26 +26,7 @@ class Deinflection {
         this.children = [];
     }
 
-    deinflect(definer, reasons) {
-        const define = () => {
-            return definer(this.term).then(definitions => {
-                if (this.rules.length === 0) {
-                    this.definitions = definitions;
-                } else {
-                    for (const rule of this.rules) {
-                        for (const definition of definitions) {
-                            if (definition.rules.includes(rule)) {
-                                this.definitions.push(definition);
-                            }
-                        }
-                    }
-                }
-
-                return this.definitions.length > 0;
-            });
-        };
-
-        const promises = [];
+    async deinflect(definer, reasons) {
         for (const reason in reasons) {
             for (const variant of reasons[reason]) {
                 let accept = this.rules.length === 0;
@@ -68,20 +49,31 @@ class Deinflection {
                 }
 
                 const child = new Deinflection(term, {reason, rules: variant.rulesOut});
-                promises.push(
-                    child.deinflect(definer, reasons).then(valid => valid && this.children.push(child))
-                );
+                if (await child.deinflect(definer, reasons)) {
+                    this.children.push(child);
+                }
             }
         }
 
-        return Promise.all(promises).then(define).then(valid => {
-            if (valid && this.children.length > 0) {
-                const child = new Deinflection(this.term, {rules: this.rules, definitions: this.definitions});
-                this.children.push(child);
+        const definitions = await definer(this.term);
+        if (this.rules.length === 0) {
+            this.definitions = definitions;
+        } else {
+            for (const rule of this.rules) {
+                for (const definition of definitions) {
+                    if (definition.rules.includes(rule)) {
+                        this.definitions.push(definition);
+                    }
+                }
             }
+        }
+
+        if (this.definitions.length > 0 && this.children.length > 0) {
+            const child = new Deinflection(this.term, {rules: this.rules, definitions: this.definitions});
+            this.children.push(child);
+        }
 
-            return valid || this.children.length > 0;
-        });
+        return this.definitions.length > 0 || this.children.length > 0;
     }
 
     gather() {
@@ -112,16 +104,16 @@ class Deinflection {
 
 
 class Deinflector {
-    constructor() {
-        this.reasons = {};
-    }
-
-    setReasons(reasons) {
+    constructor(reasons) {
         this.reasons = reasons;
     }
 
-    deinflect(term, definer) {
+    async deinflect(term, definer) {
         const node = new Deinflection(term);
-        return node.deinflect(definer, this.reasons).then(success => success ? node.gather() : []);
+        if (await node.deinflect(definer, this.reasons)) {
+            return node.gather();
+        } else {
+            return [];
+        }
     }
 }
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 35b49608..84a6e1d7 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -19,17 +19,19 @@
 
 class Translator {
     constructor() {
-        this.database = new Database();
-        this.deinflector = new Deinflector();
-        this.loaded = false;
+        this.database = null;
+        this.deinflector = null;
     }
 
     async prepare() {
-        if (!this.loaded) {
-            const reasons = await jsonLoadInt('/bg/lang/deinflect.json');
-            this.deinflector.setReasons(reasons);
+        if (!this.database) {
+            this.database = new Database();
             await this.database.prepare();
-            this.loaded = true;
+        }
+
+        if (!this.deinflector) {
+            const reasons = await jsonLoadInt('/bg/lang/deinflect.json');
+            this.deinflector = new Deinflector(reasons);
         }
     }
 
-- 
cgit v1.2.3


From f694026827ab2ce3a884206f7494b98335137709 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 14:53:06 -0700
Subject: move zip import to async

---
 ext/bg/js/database.js | 48 +++++++++++++++++++++++++++++++++++++-
 ext/bg/js/util.js     | 64 ---------------------------------------------------
 2 files changed, 47 insertions(+), 65 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 9eed8ea3..45ba3d08 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -224,7 +224,53 @@ class Database {
             await this.db.kanji.bulkAdd(rows);
         };
 
-        await zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded);
+        await Database.importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded);
         return summary;
     }
+
+    static async importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded) {
+        const files = (await JSZip.loadAsync(archive)).files;
+
+        const indexFile = files['index.json'];
+        if (!indexFile) {
+            throw 'no dictionary index found in archive';
+        }
+
+        const index = JSON.parse(await indexFile.async('string'));
+        if (!index.title || !index.version || !index.revision) {
+            throw 'unrecognized dictionary format';
+        }
+
+        await indexLoaded(
+            index.title,
+            index.version,
+            index.revision,
+            index.tagMeta || {},
+            index.termBanks > 0,
+            index.kanjiBanks > 0
+        );
+
+        const banksTotal = index.termBanks + index.kanjiBanks;
+        let banksLoaded = 0;
+
+        for (let i = 1; i <= index.termBanks; ++i) {
+            const bankFile = files[`term_bank_${i}.json`];
+            if (bankFile) {
+                const bank = JSON.parse(await bankFile.async('string'));
+                await termsLoaded(index.title, bank, banksTotal, banksLoaded++);
+            } else {
+                throw 'missing term bank file';
+            }
+        }
+
+        for (let i = 1; i <= index.kanjiBanks; ++i) {
+            const bankFile = files[`kanji_bank_${i}.json`];
+            if (bankFile) {
+                const bank = JSON.parse(await bankFile.async('string'));
+                await kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
+            } else {
+                throw 'missing kanji bank file';
+            }
+        }
+    }
 }
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index b39b4b2f..1954e83b 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -455,70 +455,6 @@ function jsonLoadInt(url) {
     return jsonLoad(chrome.extension.getURL(url));
 }
 
-/*
- * Zip
- */
-
-function zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded) {
-    return JSZip.loadAsync(archive).then(files => files.files).then(files => {
-        const indexFile = files['index.json'];
-        if (!indexFile) {
-            return Promise.reject('no dictionary index found in archive');
-        }
-
-        return indexFile.async('string').then(indexJson => {
-            const index = JSON.parse(indexJson);
-            if (!index.title || !index.version || !index.revision) {
-                return Promise.reject('unrecognized dictionary format');
-            }
-
-            return indexLoaded(
-                index.title,
-                index.version,
-                index.revision,
-                index.tagMeta || {},
-                index.termBanks > 0,
-                index.kanjiBanks > 0
-            ).then(() => index);
-        }).then(index => {
-            const loaders = [];
-            const banksTotal = index.termBanks + index.kanjiBanks;
-            let banksLoaded = 0;
-
-            for (let i = 1; i <= index.termBanks; ++i) {
-                const bankFile = files[`term_bank_${i}.json`];
-                if (!bankFile) {
-                    return Promise.reject('missing term bank file');
-                }
-
-                loaders.push(() => bankFile.async('string').then(bankJson => {
-                    const bank = JSON.parse(bankJson);
-                    return termsLoaded(index.title, bank, banksTotal, banksLoaded++);
-                }));
-            }
-
-            for (let i = 1; i <= index.kanjiBanks; ++i) {
-                const bankFile = files[`kanji_bank_${i}.json`];
-                if (!bankFile) {
-                    return Promise.reject('missing kanji bank file');
-                }
-
-                loaders.push(() => bankFile.async('string').then(bankJson => {
-                    const bank = JSON.parse(bankJson);
-                    return kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
-                }));
-            }
-
-            let chain = Promise.resolve();
-            for (const loader of loaders) {
-                chain = chain.then(loader);
-            }
-
-            return chain;
-        });
-    });
-}
-
 /*
  * Helpers
  */
-- 
cgit v1.2.3


From 28bc1449d1b2260df2970318982385b0d8456c54 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 15:00:38 -0700
Subject: cleanup

---
 ext/bg/js/translator.js | 22 +++++++++++++++++++++-
 ext/bg/js/util.js       | 26 --------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 84a6e1d7..dfe54623 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -30,7 +30,8 @@ class Translator {
         }
 
         if (!this.deinflector) {
-            const reasons = await jsonLoadInt('/bg/lang/deinflect.json');
+            const url = chrome.extension.getURL('/bg/lang/deinflect.json');
+            const reasons = await Translator.loadRules(url);
             this.deinflector = new Deinflector(reasons);
         }
     }
@@ -127,4 +128,23 @@ class Translator {
 
         return definitions;
     }
+
+
+    static loadRules(url) {
+        return new Promise((resolve, reject) => {
+            const xhr = new XMLHttpRequest();
+            xhr.overrideMimeType('application/json');
+            xhr.addEventListener('load', () => resolve(xhr.responseText));
+            xhr.addEventListener('error', () => reject('failed to execute network request'));
+            xhr.open('GET', url);
+            xhr.send();
+        }).then(responseText => {
+            try {
+                return JSON.parse(responseText);
+            }
+            catch (e) {
+                return Promise.reject('invalid JSON response');
+            }
+        });
+    }
 }
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 1954e83b..b8a60217 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -429,32 +429,6 @@ function dictFieldFormat(field, definition, mode, options) {
 }
 
 
-/*
- * Json
- */
-
-function jsonLoad(url) {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.overrideMimeType('application/json');
-        xhr.addEventListener('load', () => resolve(xhr.responseText));
-        xhr.addEventListener('error', () => reject('failed to execute network request'));
-        xhr.open('GET', url);
-        xhr.send();
-    }).then(responseText => {
-        try {
-            return JSON.parse(responseText);
-        }
-        catch (e) {
-            return Promise.reject('invalid JSON response');
-        }
-    });
-}
-
-function jsonLoadInt(url) {
-    return jsonLoad(chrome.extension.getURL(url));
-}
-
 /*
  * Helpers
  */
-- 
cgit v1.2.3


From a73b8fbab747fc5d7d2802b88d4007421cda4d87 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 15:20:07 -0700
Subject: cleanup

---
 ext/bg/js/translator.js | 9 ++-------
 ext/bg/js/yomichan.js   | 5 ++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index dfe54623..aa11ea63 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -87,14 +87,12 @@ class Translator {
         return {length, definitions};
     }
 
-    async findTermsDeinflected(text, dictionaries, cache) {
-        await this.prepare();
-
+    async findTermsDeinflected(text, titles, cache) {
         const definer = async term => {
             if (cache.hasOwnProperty(term)) {
                 return cache[term];
             } else {
-                return cache[term] = await this.database.findTerms(term, dictionaries);
+                return cache[term] = await this.database.findTerms(term, titles);
             }
         };
 
@@ -108,8 +106,6 @@ class Translator {
     }
 
     async findKanji(text, dictionaries) {
-        await this.prepare();
-
         let definitions = [];
         const processed = {};
         const titles = Object.keys(dictionaries);
@@ -129,7 +125,6 @@ class Translator {
         return definitions;
     }
 
-
     static loadRules(url) {
         return new Promise((resolve, reject) => {
             const xhr = new XMLHttpRequest();
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
index e0bdabc3..acc560ce 100644
--- a/ext/bg/js/yomichan.js
+++ b/ext/bg/js/yomichan.js
@@ -25,9 +25,12 @@ window.yomichan = new class {
         this.anki = new AnkiNull();
         this.options = null;
 
-        this.translator.prepare().then(optionsLoad).then(this.optionsSet.bind(this)).then(() => {
+        this.translator.prepare().then(optionsLoad).then(options => {
+            this.optionsSet(options);
+
             chrome.commands.onCommand.addListener(this.onCommand.bind(this));
             chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
+
             if (this.options.general.showGuide) {
                 chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
             }
-- 
cgit v1.2.3


From b0cdf59bd8dae8f44362b14bdf19b243514e31d3 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 16:24:31 -0700
Subject: move anki to async

---
 ext/bg/js/anki-connect.js | 69 +++++++++++++++++------------------------------
 ext/bg/js/anki-null.js    | 24 ++++++++---------
 ext/bg/js/translator.js   | 20 +-------------
 ext/bg/js/util.js         | 25 +++++++++++++++++
 4 files changed, 63 insertions(+), 75 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
index 173feefd..a4d8ba3f 100644
--- a/ext/bg/js/anki-connect.js
+++ b/ext/bg/js/anki-connect.js
@@ -20,69 +20,50 @@
 class AnkiConnect {
     constructor(server) {
         this.server = server;
-        this.asyncPools = {};
         this.localVersion = 2;
-        this.remoteVersion = null;
+        this.remoteVersion = 0;
     }
 
-    addNote(note) {
-        return this.checkVersion().then(() => this.ankiInvoke('addNote', {note}));
+    async addNote(note) {
+        await this.checkVersion();
+        return await this.ankiInvoke('addNote', {note});
     }
 
-    canAddNotes(notes) {
-        return this.checkVersion().then(() => this.ankiInvoke('canAddNotes', {notes}, 'notes'));
+    async canAddNotes(notes) {
+        await this.checkVersion();
+        return await this.ankiInvoke('canAddNotes', {notes});
     }
 
-    getDeckNames() {
-        return this.checkVersion().then(() => this.ankiInvoke('deckNames', {}));
+    async getDeckNames() {
+        await this.checkVersion();
+        return await this.ankiInvoke('deckNames');
     }
 
-    getModelNames() {
-        return this.checkVersion().then(() => this.ankiInvoke('modelNames', {}));
+    async getModelNames() {
+        await this.checkVersion();
+        return await this.ankiInvoke('modelNames');
     }
 
-    getModelFieldNames(modelName) {
-        return this.checkVersion().then(() => this.ankiInvoke('modelFieldNames', {modelName}));
+    async getModelFieldNames(modelName) {
+        await this.checkVersion();
+        return await this.ankiInvoke('modelFieldNames', {modelName});
     }
 
-    guiBrowse(query) {
-        return this.checkVersion().then(() => this.ankiInvoke('guiBrowse', {query}));
+    async guiBrowse(query) {
+        await this.checkVersion();
+        return await this.ankiInvoke('guiBrowse', {query});
     }
 
-    checkVersion() {
-        if (this.localVersion === this.remoteVersion) {
-            return Promise.resolve(true);
-        }
-
-        return this.ankiInvoke('version', {}, null).then(version => {
-            this.remoteVersion = version;
+    async checkVersion() {
+        if (this.remoteVersion < this.localVersion) {
+            this.remoteVersion = await this.ankiInvoke('version');
             if (this.remoteVersion < this.localVersion) {
                 return Promise.reject('extension and plugin versions incompatible');
             }
-        });
+        }
     }
 
-    ankiInvoke(action, params, pool) {
-        return new Promise((resolve, reject) => {
-            if (pool && this.asyncPools.hasOwnProperty(pool)) {
-                this.asyncPools[pool].abort();
-            }
-
-            const xhr = new XMLHttpRequest();
-            xhr.addEventListener('loadend', () => {
-                if (pool) {
-                    delete this.asyncPools[pool];
-                }
-
-                if (xhr.responseText) {
-                    resolve(JSON.parse(xhr.responseText));
-                } else {
-                    reject('unable to connect to plugin');
-                }
-            });
-
-            xhr.open('POST', this.server);
-            xhr.send(JSON.stringify({action, params}));
-        });
+    ankiInvoke(action, params) {
+        return jsonRequest(this.server, 'POST', {action, params, version: this.localVersion});
     }
 }
diff --git a/ext/bg/js/anki-null.js b/ext/bg/js/anki-null.js
index 8dad6915..d82f0e68 100644
--- a/ext/bg/js/anki-null.js
+++ b/ext/bg/js/anki-null.js
@@ -18,27 +18,27 @@
 
 
 class AnkiNull {
-    addNote(note) {
-        return Promise.reject('unsupported action');
+    async addNote(note) {
+        return null;
     }
 
-    canAddNotes(notes) {
-        return Promise.resolve([]);
+    async canAddNotes(notes) {
+        return [];
     }
 
-    getDeckNames() {
-        return Promise.resolve([]);
+    async getDeckNames() {
+        return [];
     }
 
-    getModelNames() {
-        return Promise.resolve([]);
+    async getModelNames() {
+        return [];
     }
 
-    getModelFieldNames(modelName) {
-        return Promise.resolve([]);
+    async getModelFieldNames(modelName) {
+        return [];
     }
 
-    guiBrowse(query) {
-        return Promise.resolve([]);
+    async guiBrowse(query) {
+        return [];
     }
 }
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index aa11ea63..9232e529 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -31,7 +31,7 @@ class Translator {
 
         if (!this.deinflector) {
             const url = chrome.extension.getURL('/bg/lang/deinflect.json');
-            const reasons = await Translator.loadRules(url);
+            const reasons = await jsonRequest(url, 'GET');
             this.deinflector = new Deinflector(reasons);
         }
     }
@@ -124,22 +124,4 @@ class Translator {
 
         return definitions;
     }
-
-    static loadRules(url) {
-        return new Promise((resolve, reject) => {
-            const xhr = new XMLHttpRequest();
-            xhr.overrideMimeType('application/json');
-            xhr.addEventListener('load', () => resolve(xhr.responseText));
-            xhr.addEventListener('error', () => reject('failed to execute network request'));
-            xhr.open('GET', url);
-            xhr.send();
-        }).then(responseText => {
-            try {
-                return JSON.parse(responseText);
-            }
-            catch (e) {
-                return Promise.reject('invalid JSON response');
-            }
-        });
-    }
 }
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index b8a60217..4f907923 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -428,6 +428,31 @@ function dictFieldFormat(field, definition, mode, options) {
     return field;
 }
 
+/*
+ * JSON
+ */
+
+function jsonRequest(url, action, params) {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.overrideMimeType('application/json');
+        xhr.addEventListener('load', () => resolve(xhr.responseText));
+        xhr.addEventListener('error', () => reject('failed to execute network request'));
+        xhr.open(action, url);
+        if (params) {
+            xhr.send(JSON.stringify(params));
+        } else {
+            xhr.send();
+        }
+    }).then(responseText => {
+        try {
+            return JSON.parse(responseText);
+        }
+        catch (e) {
+            return Promise.reject('invalid JSON response');
+        }
+    });
+}
 
 /*
  * Helpers
-- 
cgit v1.2.3


From 1ed8997240ba5d8ee4fe57062d2dbe8ba46436e2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 10 Jul 2017 16:48:26 -0700
Subject: work on audio

---
 ext/bg/js/database.js |  3 +--
 ext/mixed/js/util.js  | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 45ba3d08..b38e00db 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -32,8 +32,7 @@ class Database {
             if (db.verno !== this.version) {
                 await db.delete();
             }
-        }
-        catch(error) {
+        } catch(e) {
             // NOP
         }
     }
diff --git a/ext/mixed/js/util.js b/ext/mixed/js/util.js
index 5cf62000..0a8c914d 100644
--- a/ext/mixed/js/util.js
+++ b/ext/mixed/js/util.js
@@ -40,7 +40,7 @@ function clozeBuild(sentence, source) {
  * Audio
  */
 
-function audioBuildUrl(definition, mode, cache={}) {
+async function audioBuildUrl(definition, mode, cache={}) {
     if (mode === 'jpod101') {
         let kana = definition.reading;
         let kanji = definition.expression;
@@ -103,7 +103,7 @@ function audioBuildUrl(definition, mode, cache={}) {
             }
         });
     } else {
-        return Promise.reject('unsupported audio source');
+        return Promise.resolve();
     }
 }
 
@@ -121,16 +121,7 @@ function audioBuildFilename(definition) {
     }
 }
 
-function audioInject(definition, fields, mode) {
-    if (mode === 'disabled') {
-        return Promise.resolve(true);
-    }
-
-    const filename = audioBuildFilename(definition);
-    if (!filename) {
-        return Promise.resolve(true);
-    }
-
+async function audioInject(definition, fields, mode) {
     let usesAudio = false;
     for (const name in fields) {
         if (fields[name].includes('{audio}')) {
@@ -140,11 +131,19 @@ function audioInject(definition, fields, mode) {
     }
 
     if (!usesAudio) {
-        return Promise.resolve(true);
+        return true;
     }
 
-    return audioBuildUrl(definition, mode).then(url => {
-        definition.audio = {url, filename};
+    try {
+        const url = await audioBuildUrl(definition, mode);
+        const filename = audioBuildFilename(definition);
+
+        if (url && filename) {
+            definition.audio = {url, filename};
+        }
+
         return true;
-    }).catch(() => false);
+    } catch (e) {
+        return false;
+    }
 }
-- 
cgit v1.2.3


From ede139097c670f16ca3c332d8a79e9009b23bfac Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 16 Jul 2017 05:05:23 -0300
Subject: Add glossary-brief anki field, like glossary but without tags

---
 README.md              |   1 +
 ext/bg/js/options.js   |   1 +
 ext/bg/js/templates.js | 239 ++++++++++++++++++++++++++-----------------------
 ext/bg/js/util.js      |   1 +
 tmpl/fields.html       |  20 +++--
 5 files changed, 143 insertions(+), 119 deletions(-)

(limited to 'ext/bg/js')

diff --git a/README.md b/README.md
index c32c867f..6ac97eea 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,7 @@ Flashcard fields can be configured with the following steps:
     `{expression}` | Term expressed as Kanji (will be displayed in Kana if Kanji is not available).
     `{furigana}` | Term expressed as Kanji with Furigana displayed above it (e.g. <ruby>日本語<rt>にほんご</rt></ruby>).
     `{glossary}` | List of definitions for the term (output format depends on whether running in *grouped* mode).
+    `{glossary-brief}` | Shorter version of `{glossary}`, without `{tags}`
     `{reading}` | Kana reading for the term (empty for terms where the expression is the reading).
     `{sentence}` | Sentence, quote, or phrase in which the term appears in the source content.
     `{tags}` | Grammar and usage tags providing information about the term (unavailable in *grouped* mode).
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 728ddae4..e105f1b2 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -351,6 +351,7 @@ function ankiFieldsPopulate(element, options) {
             'expression',
             'furigana',
             'glossary',
+            'glossary-brief',
             'reading',
             'sentence',
             'tags',
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 50686ed4..6fa1dad0 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -24,106 +24,114 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 templates['fields.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(14, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(15, data, 0),"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=depth0 != null ? depth0 : {};
 
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
 },"3":function(container,depth0,helpers,partials,data) {
     var stack1;
 
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
   return "<i>("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ")</i> ";
-},"4":function(container,depth0,helpers,partials,data) {
+},"5":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {};
 
   return container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
-    + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"5":function(container,depth0,helpers,partials,data) {
+    + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"6":function(container,depth0,helpers,partials,data) {
     return ", ";
-},"7":function(container,depth0,helpers,partials,data) {
+},"8":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<ul>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ul>";
-},"8":function(container,depth0,helpers,partials,data) {
+},"9":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "<li>";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</li>";
-},"9":function(container,depth0,helpers,partials,data) {
+},"10":function(container,depth0,helpers,partials,data) {
     return container.escapeExpression(container.lambda(depth0, depth0));
-},"11":function(container,depth0,helpers,partials,data) {
+},"12":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = "";
 
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer;
-},"12":function(container,depth0,helpers,partials,data) {
+},"13":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
-},"14":function(container,depth0,helpers,partials,data) {
+},"15":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=depth0 != null ? depth0 : {};
 
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
-},"15":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(19, data, 0),"inverse":container.program(13, data, 0),"data":data})) != null ? stack1 : "");
+},"16":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"17":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ") ";
-},"17":function(container,depth0,helpers,partials,data) {
+},"19":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"18":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"20":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(depth0, depth0))
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"20":function(container,depth0,helpers,partials,data) {
-    return "";
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"22":function(container,depth0,helpers,partials,data) {
+    return "";
+},"24":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.character : stack1), depth0));
-},"24":function(container,depth0,helpers,partials,data) {
+},"26":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.dictionary : stack1), depth0));
-},"26":function(container,depth0,helpers,partials,data) {
+},"28":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"27":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(29, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"29":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(28, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"28":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(30, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"30":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0));
-},"30":function(container,depth0,helpers,partials,data) {
+},"32":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0));
-},"32":function(container,depth0,helpers,partials,data) {
+},"34":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(33, data, 0),"inverse":container.program(36, data, 0),"data":data})) != null ? stack1 : "");
-},"33":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0),"inverse":container.program(38, data, 0),"data":data})) != null ? stack1 : "");
+},"35":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"34":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(36, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"36":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
   return "<ruby>"
@@ -131,147 +139,151 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     + "<rt>"
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
     + "</rt></ruby>";
-},"36":function(container,depth0,helpers,partials,data) {
+},"38":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(37, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"37":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(39, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"39":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
   return alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0))
     + " ["
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
     + "]";
-},"39":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"41":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, alias1=depth0 != null ? depth0 : {};
 
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(40, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.program(51, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(64, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"40":function(container,depth0,helpers,partials,data) {
-    return "<div style=\"text-align: left;\">";
+  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0, blockParams, depths),"inverse":container.program(53, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"42":function(container,depth0,helpers,partials,data) {
+    return "<div style=\"text-align: left;\">";
+},"44":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(43, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
-},"43":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(45, data, 0),"inverse":container.program(51, data, 0),"data":data})) != null ? stack1 : "");
+},"45":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0),"inverse":container.program(47, data, 0),"data":data})) != null ? stack1 : "");
-},"44":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(46, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
+},"46":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<ol>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(45, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(47, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ol>";
-},"45":function(container,depth0,helpers,partials,data) {
+},"47":function(container,depth0,helpers,partials,data) {
     return "<li>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</li>";
-},"47":function(container,depth0,helpers,partials,data) {
+},"49":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"49":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"51":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["0"] : stack1), depth0));
-},"51":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(52, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"52":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(64, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(53, data, 0, blockParams, depths),"inverse":container.program(60, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(57, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(56, data, 0, blockParams, depths),"inverse":container.program(59, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"56":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "<ol>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(57, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ol>";
-},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "<li>"
-    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"brief":(depths[1] != null ? depths[1].brief : depths[1]),"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "</li>";
-},"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"59":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(58, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"58":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return " * "
-    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"60":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","hash":{"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"brief":(depths[1] != null ? depths[1].brief : depths[1]),"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"62":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","hash":{"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","hash":{"brief":(depth0 != null ? depth0.brief : depth0),"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"64":function(container,depth0,helpers,partials,data) {
-    return "</div>";
-},"66":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","hash":{"brief":(depth0 != null ? depth0.brief : depth0),"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"66":function(container,depth0,helpers,partials,data) {
+    return "</div>";
 },"68":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials.glossary,depth0,{"name":"glossary","hash":{"brief":true},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"70":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"72":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(73, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"73":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"74":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(30, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"76":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(77, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"77":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.sentence : stack1), depth0));
-},"75":function(container,depth0,helpers,partials,data) {
+},"79":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(76, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"76":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(80, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"80":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.prefix : stack1), depth0));
-},"78":function(container,depth0,helpers,partials,data) {
+},"82":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(79, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"79":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(83, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"83":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.body : stack1), depth0));
-},"81":function(container,depth0,helpers,partials,data) {
+},"85":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(82, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"82":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(86, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"86":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.suffix : stack1), depth0));
-},"84":function(container,depth0,helpers,partials,data) {
+},"88":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"86":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"90":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(87, data, 0),"inverse":container.program(89, data, 0),"data":data})) != null ? stack1 : "");
-},"87":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(91, data, 0),"inverse":container.program(93, data, 0),"data":data})) != null ? stack1 : "");
+},"91":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
   return "<a href=\""
@@ -279,35 +291,36 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     + "\">"
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0))
     + "</a>";
-},"89":function(container,depth0,helpers,partials,data) {
+},"93":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0));
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+  return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : {},depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != 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":["glossary-single"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(20, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(68, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(70, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(72, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(75, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-prefix"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(78, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-body"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(81, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-suffix"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(84, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(86, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(28, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(34, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(41, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(68, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary-brief"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(70, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(72, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(74, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(76, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(79, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-prefix"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(82, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-body"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(85, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-suffix"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(88, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(90, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;
   return fn;
   }
 
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 4f907923..4d0aa27e 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -400,6 +400,7 @@ function dictFieldFormat(field, definition, mode, options) {
         'expression',
         'furigana',
         'glossary',
+        'glossary-brief',
         'kunyomi',
         'onyomi',
         'reading',
diff --git a/tmpl/fields.html b/tmpl/fields.html
index ab1a9722..944a43e6 100644
--- a/tmpl/fields.html
+++ b/tmpl/fields.html
@@ -1,13 +1,17 @@
 {{#*inline "glossary-single"}}
     {{~#if html~}}
-        {{~#if tags~}}<i>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}}
+        {{~#unless brief~}}
+            {{~#if tags~}}<i>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}}
+        {{~/unless~}}
         {{~#if glossary.[1]~}}
             <ul>{{#each glossary}}<li>{{#multiLine}}{{.}}{{/multiLine}}</li>{{/each}}</ul>
         {{~else~}}
             {{~#multiLine}}{{glossary.[0]}}{{/multiLine~}}
         {{~/if~}}
     {{~else~}}
-        {{~#if tags~}}({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if~}}
+        {{~#unless brief~}}
+            {{~#if tags~}}({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if~}}
+        {{~/unless~}}
         {{~#if glossary.[1]~}}
             {{#each glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}
         {{~else~}}
@@ -58,18 +62,22 @@
     {{~else~}}
         {{~#if group~}}
             {{~#if definition.definitions.[1]~}}
-                {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html}}</li>{{/each}}</ol>
-                {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html}}{{/each}}{{/if~}}
+                {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html brief=../brief}}</li>{{/each}}</ol>
+                {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html brief=../brief}}{{/each}}{{/if~}}
             {{~else~}}
-                {{~> glossary-single definition.definitions.[0] html=html~}}
+                {{~> glossary-single definition.definitions.[0] html=html brief=brief~}}
             {{~/if~}}
         {{~else~}}
-            {{~> glossary-single definition html=html~}}
+            {{~> glossary-single definition html=html brief=brief~}}
         {{~/if~}}
     {{~/if~}}
     {{~#if html}}</div>{{/if~}}
 {{/inline}}
 
+{{#*inline "glossary-brief"}}
+    {{~> glossary brief=true ~}}
+{{/inline}}
+
 {{#*inline "kunyomi"}}
     {{~#each definition.kunyomi}}{{.}}{{#unless @last}}, {{/unless}}{{/each~}}
 {{/inline}}
-- 
cgit v1.2.3


From 7dd75082abd31b725d9907a93ab97fe1434bab04 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 16 Jul 2017 12:59:16 -0700
Subject: rename options to settings

---
 ext/bg/js/options.js  | 405 --------------------------------------------------
 ext/bg/js/settings.js | 405 ++++++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/options.html   | 282 -----------------------------------
 ext/bg/settings.html  | 282 +++++++++++++++++++++++++++++++++++
 ext/manifest.json     |   2 +-
 5 files changed, 688 insertions(+), 688 deletions(-)
 delete mode 100644 ext/bg/js/options.js
 create mode 100644 ext/bg/js/settings.js
 delete mode 100644 ext/bg/options.html
 create mode 100644 ext/bg/settings.html

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
deleted file mode 100644
index e105f1b2..00000000
--- a/ext/bg/js/options.js
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) 2016  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/>.
- */
-
-
-/*
- * General
- */
-
-function formRead() {
-    return optionsLoad().then(optionsOld => {
-        const optionsNew = $.extend(true, {}, optionsOld);
-
-        optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
-        optionsNew.general.audioSource = $('#audio-playback-source').val();
-        optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
-        optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
-        optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
-        optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
-        optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
-        optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
-        optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
-        optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
-
-        optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
-        optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
-        optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
-        optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
-        optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
-        optionsNew.scanning.modifier = $('#scan-modifier-key').val();
-
-        optionsNew.anki.enable = $('#anki-enable').prop('checked');
-        optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
-        optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
-        optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
-        optionsNew.anki.server = $('#interface-server').val();
-
-        if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
-            optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
-            optionsNew.anki.terms.model = $('#anki-terms-model').val();
-            optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
-            optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
-            optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
-            optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
-        }
-
-        $('.dict-group').each((index, element) => {
-            const dictionary = $(element);
-            const title = dictionary.data('title');
-            const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
-            const enabled = dictionary.find('.dict-enabled').prop('checked');
-            optionsNew.dictionaries[title] = {priority, enabled};
-        });
-
-        return {optionsNew, optionsOld};
-    });
-}
-
-function updateVisibility(options) {
-    const general = $('#anki-general');
-    if (options.anki.enable) {
-        general.show();
-    } else {
-        general.hide();
-    }
-
-    const advanced = $('.options-advanced');
-    if (options.general.showAdvanced) {
-        advanced.show();
-    } else {
-        advanced.hide();
-    }
-
-    const debug = $('#debug');
-    if (options.general.debugInfo) {
-        const text = JSON.stringify(options, null, 4);
-        debug.html(handlebarsEscape(text));
-        debug.show();
-    } else {
-        debug.hide();
-    }
-}
-
-function onOptionsChanged(e) {
-    if (!e.originalEvent && !e.isTrigger) {
-        return;
-    }
-
-    formRead().then(({optionsNew, optionsOld}) => {
-        return optionsSave(optionsNew).then(() => {
-            updateVisibility(optionsNew);
-
-            const ankiUpdated =
-                optionsNew.anki.enable !== optionsOld.anki.enable ||
-                optionsNew.anki.server !== optionsOld.anki.server;
-
-            if (ankiUpdated) {
-                ankiErrorShow(null);
-                ankiSpinnerShow(true);
-                return ankiDeckAndModelPopulate(optionsNew);
-            }
-        });
-    }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-}
-
-$(document).ready(() => {
-    handlebarsRegister();
-
-    optionsLoad().then(options => {
-        $('#show-usage-guide').prop('checked', options.general.showGuide);
-        $('#audio-playback-source').val(options.general.audioSource);
-        $('#audio-playback-volume').val(options.general.audioVolume);
-        $('#group-terms-results').prop('checked', options.general.groupResults);
-        $('#show-debug-info').prop('checked', options.general.debugInfo);
-        $('#show-advanced-options').prop('checked', options.general.showAdvanced);
-        $('#max-displayed-results').val(options.general.maxResults);
-        $('#popup-width').val(options.general.popupWidth);
-        $('#popup-height').val(options.general.popupHeight);
-        $('#popup-offset').val(options.general.popupOffset);
-
-        $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
-        $('#select-matched-text').prop('checked', options.scanning.selectText);
-        $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
-        $('#scan-delay').val(options.scanning.delay);
-        $('#scan-length').val(options.scanning.length);
-        $('#scan-modifier-key').val(options.scanning.modifier);
-
-        $('#dict-purge').click(onDictionaryPurge);
-        $('#dict-file').change(onDictionaryImport);
-
-        $('#anki-enable').prop('checked', options.anki.enable);
-        $('#card-tags').val(options.anki.tags.join(' '));
-        $('#generate-html-cards').prop('checked', options.anki.htmlCards);
-        $('#sentence-detection-extent').val(options.anki.sentenceExt);
-        $('#interface-server').val(options.anki.server);
-        $('input, select').not('.anki-model').change(onOptionsChanged);
-        $('.anki-model').change(onAnkiModelChanged);
-
-        dictionaryGroupsPopulate(options);
-        ankiDeckAndModelPopulate(options);
-        updateVisibility(options);
-    });
-});
-
-
-/*
- * Dictionary
- */
-
-function dictionaryErrorShow(error) {
-    const dialog = $('#dict-error');
-    if (error) {
-        dialog.show().find('span').text(error);
-    } else {
-        dialog.hide();
-    }
-}
-
-function dictionarySpinnerShow(show) {
-    const spinner = $('#dict-spinner');
-    if (show) {
-        spinner.show();
-    } else {
-        spinner.hide();
-    }
-}
-
-function dictionaryGroupsSort() {
-    const dictGroups = $('#dict-groups');
-    const dictGroupChildren = dictGroups.children('.dict-group').sort((ca, cb) => {
-        const pa = parseInt($(ca).find('.dict-priority').val(), 10);
-        const pb = parseInt($(cb).find('.dict-priority').val(), 10);
-        if (pa < pb) {
-            return 1;
-        } else if (pa > pb) {
-            return -1;
-        } else {
-            return 0;
-        }
-    });
-
-    dictGroups.append(dictGroupChildren);
-}
-
-function dictionaryGroupsPopulate(options) {
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
-    const dictGroups = $('#dict-groups').empty();
-    const dictWarning = $('#dict-warning').hide();
-
-    return instDb().getDictionaries().then(rows => {
-        if (rows.length === 0) {
-            dictWarning.show();
-        }
-
-        for (const row of dictRowsSort(rows, options)) {
-            const dictOptions = options.dictionaries[row.title] || {enabled: false, priority: 0};
-            const dictHtml = handlebarsRender('dictionary.html', {
-                title: row.title,
-                version: row.version,
-                revision: row.revision,
-                priority: dictOptions.priority,
-                enabled: dictOptions.enabled
-            });
-
-            dictGroups.append($(dictHtml));
-        }
-
-        updateVisibility(options);
-
-        $('.dict-enabled, .dict-priority').change(e => {
-            dictionaryGroupsSort();
-            onOptionsChanged(e);
-        });
-    }).catch(dictionaryErrorShow).then(() => dictionarySpinnerShow(false));
-}
-
-function onDictionaryPurge(e) {
-    e.preventDefault();
-
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
-    const dictControls = $('#dict-importer, #dict-groups').hide();
-    const dictProgress = $('#dict-purge-progress').show();
-
-    instDb().purge().catch(dictionaryErrorShow).then(() => {
-        dictionarySpinnerShow(false);
-        dictControls.show();
-        dictProgress.hide();
-        return optionsLoad();
-    }).then(options => {
-        options.dictionaries = {};
-        optionsSave(options).then(() => dictionaryGroupsPopulate(options));
-    });
-}
-
-function onDictionaryImport(e) {
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
-    const dictFile = $('#dict-file');
-    const dictImporter = $('#dict-importer').hide();
-    const dictProgress = $('#dict-import-progress').show();
-    const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
-    const updateProgress = (total, current) => setProgress(current / total * 100.0);
-
-    setProgress(0.0);
-
-    optionsLoad().then(options => {
-        return instDb().importDictionary(e.target.files[0], updateProgress).then(summary => {
-            options.dictionaries[summary.title] = {enabled: true, priority: 0};
-            return optionsSave(options);
-        }).then(() => dictionaryGroupsPopulate(options));
-    }).catch(dictionaryErrorShow).then(() => {
-        dictFile.val('');
-        dictionarySpinnerShow(false);
-        dictProgress.hide();
-        dictImporter.show();
-    });
-}
-
-/*
- * Anki
- */
-
-function ankiSpinnerShow(show) {
-    const spinner = $('#anki-spinner');
-    if (show) {
-        spinner.show();
-    } else {
-        spinner.hide();
-    }
-}
-
-function ankiErrorShow(error) {
-    const dialog = $('#anki-error');
-    if (error) {
-        dialog.show().find('span').text(error);
-    }
-    else {
-        dialog.hide();
-    }
-}
-
-function ankiFieldsToDict(selection) {
-    const result = {};
-    selection.each((index, element) => {
-        result[$(element).data('field')] = $(element).val();
-    });
-
-    return result;
-}
-
-function ankiDeckAndModelPopulate(options) {
-    ankiErrorShow(null);
-    ankiSpinnerShow(true);
-
-    const ankiFormat = $('#anki-format').hide();
-    return Promise.all([instAnki().getDeckNames(), instAnki().getModelNames()]).then(([deckNames, modelNames]) => {
-        const ankiDeck = $('.anki-deck');
-        ankiDeck.find('option').remove();
-        deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
-
-        $('#anki-terms-deck').val(options.anki.terms.deck);
-        $('#anki-kanji-deck').val(options.anki.kanji.deck);
-
-        const ankiModel = $('.anki-model');
-        ankiModel.find('option').remove();
-        modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
-
-        return Promise.all([
-            ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options),
-            ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options)
-        ]);
-    }).then(() => ankiFormat.show()).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-}
-
-function ankiFieldsPopulate(element, options) {
-    const tab = element.closest('.tab-pane');
-    const tabId = tab.attr('id');
-    const container = tab.find('tbody').empty();
-
-    const modelName = element.val();
-    if (!modelName) {
-        return Promise.resolve();
-    }
-
-    const markers = {
-        'terms': [
-            'audio',
-            'cloze-body',
-            'cloze-prefix',
-            'cloze-suffix',
-            'dictionary',
-            'expression',
-            'furigana',
-            'glossary',
-            'glossary-brief',
-            'reading',
-            'sentence',
-            'tags',
-            'url'
-        ],
-        'kanji': [
-            'character',
-            'dictionary',
-            'glossary',
-            'kunyomi',
-            'onyomi',
-            'sentence',
-            'tags',
-            'url'
-        ]
-    }[tabId] || {};
-
-    return instAnki().getModelFieldNames(modelName).then(names => {
-        names.forEach(name => {
-            const value = options.anki[tabId].fields[name] || '';
-            const html = Handlebars.templates['model.html']({name, markers, value});
-            container.append($(html));
-        });
-
-        tab.find('.anki-field-value').change(onOptionsChanged);
-        tab.find('.marker-link').click(e => {
-            e.preventDefault();
-            const link = e.target;
-            $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
-        });
-    });
-}
-
-function onAnkiModelChanged(e) {
-    if (!e.originalEvent) {
-        return;
-    }
-
-    ankiErrorShow(null);
-    ankiSpinnerShow(true);
-
-    const element = $(this);
-    formRead().then(({optionsNew, optionsOld}) => {
-        const tab = element.closest('.tab-pane');
-        const tabId = tab.attr('id');
-        optionsNew.anki[tabId].fields = {};
-        ankiFieldsPopulate(element, optionsNew).then(() => {
-            optionsSave(optionsNew);
-        }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-    });
-}
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
new file mode 100644
index 00000000..e105f1b2
--- /dev/null
+++ b/ext/bg/js/settings.js
@@ -0,0 +1,405 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+/*
+ * General
+ */
+
+function formRead() {
+    return optionsLoad().then(optionsOld => {
+        const optionsNew = $.extend(true, {}, optionsOld);
+
+        optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
+        optionsNew.general.audioSource = $('#audio-playback-source').val();
+        optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
+        optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
+        optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
+        optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
+        optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
+        optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
+        optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
+        optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
+
+        optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
+        optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
+        optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
+        optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
+        optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
+        optionsNew.scanning.modifier = $('#scan-modifier-key').val();
+
+        optionsNew.anki.enable = $('#anki-enable').prop('checked');
+        optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
+        optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
+        optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
+        optionsNew.anki.server = $('#interface-server').val();
+
+        if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
+            optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
+            optionsNew.anki.terms.model = $('#anki-terms-model').val();
+            optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
+            optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
+            optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
+            optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+        }
+
+        $('.dict-group').each((index, element) => {
+            const dictionary = $(element);
+            const title = dictionary.data('title');
+            const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
+            const enabled = dictionary.find('.dict-enabled').prop('checked');
+            optionsNew.dictionaries[title] = {priority, enabled};
+        });
+
+        return {optionsNew, optionsOld};
+    });
+}
+
+function updateVisibility(options) {
+    const general = $('#anki-general');
+    if (options.anki.enable) {
+        general.show();
+    } else {
+        general.hide();
+    }
+
+    const advanced = $('.options-advanced');
+    if (options.general.showAdvanced) {
+        advanced.show();
+    } else {
+        advanced.hide();
+    }
+
+    const debug = $('#debug');
+    if (options.general.debugInfo) {
+        const text = JSON.stringify(options, null, 4);
+        debug.html(handlebarsEscape(text));
+        debug.show();
+    } else {
+        debug.hide();
+    }
+}
+
+function onOptionsChanged(e) {
+    if (!e.originalEvent && !e.isTrigger) {
+        return;
+    }
+
+    formRead().then(({optionsNew, optionsOld}) => {
+        return optionsSave(optionsNew).then(() => {
+            updateVisibility(optionsNew);
+
+            const ankiUpdated =
+                optionsNew.anki.enable !== optionsOld.anki.enable ||
+                optionsNew.anki.server !== optionsOld.anki.server;
+
+            if (ankiUpdated) {
+                ankiErrorShow(null);
+                ankiSpinnerShow(true);
+                return ankiDeckAndModelPopulate(optionsNew);
+            }
+        });
+    }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+}
+
+$(document).ready(() => {
+    handlebarsRegister();
+
+    optionsLoad().then(options => {
+        $('#show-usage-guide').prop('checked', options.general.showGuide);
+        $('#audio-playback-source').val(options.general.audioSource);
+        $('#audio-playback-volume').val(options.general.audioVolume);
+        $('#group-terms-results').prop('checked', options.general.groupResults);
+        $('#show-debug-info').prop('checked', options.general.debugInfo);
+        $('#show-advanced-options').prop('checked', options.general.showAdvanced);
+        $('#max-displayed-results').val(options.general.maxResults);
+        $('#popup-width').val(options.general.popupWidth);
+        $('#popup-height').val(options.general.popupHeight);
+        $('#popup-offset').val(options.general.popupOffset);
+
+        $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
+        $('#select-matched-text').prop('checked', options.scanning.selectText);
+        $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
+        $('#scan-delay').val(options.scanning.delay);
+        $('#scan-length').val(options.scanning.length);
+        $('#scan-modifier-key').val(options.scanning.modifier);
+
+        $('#dict-purge').click(onDictionaryPurge);
+        $('#dict-file').change(onDictionaryImport);
+
+        $('#anki-enable').prop('checked', options.anki.enable);
+        $('#card-tags').val(options.anki.tags.join(' '));
+        $('#generate-html-cards').prop('checked', options.anki.htmlCards);
+        $('#sentence-detection-extent').val(options.anki.sentenceExt);
+        $('#interface-server').val(options.anki.server);
+        $('input, select').not('.anki-model').change(onOptionsChanged);
+        $('.anki-model').change(onAnkiModelChanged);
+
+        dictionaryGroupsPopulate(options);
+        ankiDeckAndModelPopulate(options);
+        updateVisibility(options);
+    });
+});
+
+
+/*
+ * Dictionary
+ */
+
+function dictionaryErrorShow(error) {
+    const dialog = $('#dict-error');
+    if (error) {
+        dialog.show().find('span').text(error);
+    } else {
+        dialog.hide();
+    }
+}
+
+function dictionarySpinnerShow(show) {
+    const spinner = $('#dict-spinner');
+    if (show) {
+        spinner.show();
+    } else {
+        spinner.hide();
+    }
+}
+
+function dictionaryGroupsSort() {
+    const dictGroups = $('#dict-groups');
+    const dictGroupChildren = dictGroups.children('.dict-group').sort((ca, cb) => {
+        const pa = parseInt($(ca).find('.dict-priority').val(), 10);
+        const pb = parseInt($(cb).find('.dict-priority').val(), 10);
+        if (pa < pb) {
+            return 1;
+        } else if (pa > pb) {
+            return -1;
+        } else {
+            return 0;
+        }
+    });
+
+    dictGroups.append(dictGroupChildren);
+}
+
+function dictionaryGroupsPopulate(options) {
+    dictionaryErrorShow(null);
+    dictionarySpinnerShow(true);
+
+    const dictGroups = $('#dict-groups').empty();
+    const dictWarning = $('#dict-warning').hide();
+
+    return instDb().getDictionaries().then(rows => {
+        if (rows.length === 0) {
+            dictWarning.show();
+        }
+
+        for (const row of dictRowsSort(rows, options)) {
+            const dictOptions = options.dictionaries[row.title] || {enabled: false, priority: 0};
+            const dictHtml = handlebarsRender('dictionary.html', {
+                title: row.title,
+                version: row.version,
+                revision: row.revision,
+                priority: dictOptions.priority,
+                enabled: dictOptions.enabled
+            });
+
+            dictGroups.append($(dictHtml));
+        }
+
+        updateVisibility(options);
+
+        $('.dict-enabled, .dict-priority').change(e => {
+            dictionaryGroupsSort();
+            onOptionsChanged(e);
+        });
+    }).catch(dictionaryErrorShow).then(() => dictionarySpinnerShow(false));
+}
+
+function onDictionaryPurge(e) {
+    e.preventDefault();
+
+    dictionaryErrorShow(null);
+    dictionarySpinnerShow(true);
+
+    const dictControls = $('#dict-importer, #dict-groups').hide();
+    const dictProgress = $('#dict-purge-progress').show();
+
+    instDb().purge().catch(dictionaryErrorShow).then(() => {
+        dictionarySpinnerShow(false);
+        dictControls.show();
+        dictProgress.hide();
+        return optionsLoad();
+    }).then(options => {
+        options.dictionaries = {};
+        optionsSave(options).then(() => dictionaryGroupsPopulate(options));
+    });
+}
+
+function onDictionaryImport(e) {
+    dictionaryErrorShow(null);
+    dictionarySpinnerShow(true);
+
+    const dictFile = $('#dict-file');
+    const dictImporter = $('#dict-importer').hide();
+    const dictProgress = $('#dict-import-progress').show();
+    const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
+    const updateProgress = (total, current) => setProgress(current / total * 100.0);
+
+    setProgress(0.0);
+
+    optionsLoad().then(options => {
+        return instDb().importDictionary(e.target.files[0], updateProgress).then(summary => {
+            options.dictionaries[summary.title] = {enabled: true, priority: 0};
+            return optionsSave(options);
+        }).then(() => dictionaryGroupsPopulate(options));
+    }).catch(dictionaryErrorShow).then(() => {
+        dictFile.val('');
+        dictionarySpinnerShow(false);
+        dictProgress.hide();
+        dictImporter.show();
+    });
+}
+
+/*
+ * Anki
+ */
+
+function ankiSpinnerShow(show) {
+    const spinner = $('#anki-spinner');
+    if (show) {
+        spinner.show();
+    } else {
+        spinner.hide();
+    }
+}
+
+function ankiErrorShow(error) {
+    const dialog = $('#anki-error');
+    if (error) {
+        dialog.show().find('span').text(error);
+    }
+    else {
+        dialog.hide();
+    }
+}
+
+function ankiFieldsToDict(selection) {
+    const result = {};
+    selection.each((index, element) => {
+        result[$(element).data('field')] = $(element).val();
+    });
+
+    return result;
+}
+
+function ankiDeckAndModelPopulate(options) {
+    ankiErrorShow(null);
+    ankiSpinnerShow(true);
+
+    const ankiFormat = $('#anki-format').hide();
+    return Promise.all([instAnki().getDeckNames(), instAnki().getModelNames()]).then(([deckNames, modelNames]) => {
+        const ankiDeck = $('.anki-deck');
+        ankiDeck.find('option').remove();
+        deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
+
+        $('#anki-terms-deck').val(options.anki.terms.deck);
+        $('#anki-kanji-deck').val(options.anki.kanji.deck);
+
+        const ankiModel = $('.anki-model');
+        ankiModel.find('option').remove();
+        modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
+
+        return Promise.all([
+            ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options),
+            ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options)
+        ]);
+    }).then(() => ankiFormat.show()).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+}
+
+function ankiFieldsPopulate(element, options) {
+    const tab = element.closest('.tab-pane');
+    const tabId = tab.attr('id');
+    const container = tab.find('tbody').empty();
+
+    const modelName = element.val();
+    if (!modelName) {
+        return Promise.resolve();
+    }
+
+    const markers = {
+        'terms': [
+            'audio',
+            'cloze-body',
+            'cloze-prefix',
+            'cloze-suffix',
+            'dictionary',
+            'expression',
+            'furigana',
+            'glossary',
+            'glossary-brief',
+            'reading',
+            'sentence',
+            'tags',
+            'url'
+        ],
+        'kanji': [
+            'character',
+            'dictionary',
+            'glossary',
+            'kunyomi',
+            'onyomi',
+            'sentence',
+            'tags',
+            'url'
+        ]
+    }[tabId] || {};
+
+    return instAnki().getModelFieldNames(modelName).then(names => {
+        names.forEach(name => {
+            const value = options.anki[tabId].fields[name] || '';
+            const html = Handlebars.templates['model.html']({name, markers, value});
+            container.append($(html));
+        });
+
+        tab.find('.anki-field-value').change(onOptionsChanged);
+        tab.find('.marker-link').click(e => {
+            e.preventDefault();
+            const link = e.target;
+            $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
+        });
+    });
+}
+
+function onAnkiModelChanged(e) {
+    if (!e.originalEvent) {
+        return;
+    }
+
+    ankiErrorShow(null);
+    ankiSpinnerShow(true);
+
+    const element = $(this);
+    formRead().then(({optionsNew, optionsOld}) => {
+        const tab = element.closest('.tab-pane');
+        const tabId = tab.attr('id');
+        optionsNew.anki[tabId].fields = {};
+        ankiFieldsPopulate(element, optionsNew).then(() => {
+            optionsSave(optionsNew);
+        }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+    });
+}
diff --git a/ext/bg/options.html b/ext/bg/options.html
deleted file mode 100644
index 34728d90..00000000
--- a/ext/bg/options.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <title>Yomichan Options</title>
-        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
-        <style>
-            #anki-spinner, #anki-general, #anki-error,
-            #dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress,
-            #debug,
-            .options-advanced {
-                display: none;
-            }
-
-            .tab-content {
-                border-bottom: 1px #ddd solid;
-                border-left: 1px #ddd solid;
-                border-right: 1px #ddd solid;
-                padding: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="container-fluid">
-            <div>
-                <h3>General Options</h3>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="show-usage-guide"> Show usage guide on startup</label>
-                </div>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="group-terms-results"> Group term results</label>
-                </div>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="show-advanced-options"> Show advanced options</label>
-                </div>
-
-                <div class="checkbox options-advanced">
-                    <label><input type="checkbox" id="show-debug-info"> Show debug information</label>
-                </div>
-
-                <div class="form-group">
-                    <label for="audio-playback-source">Audio playback source</label>
-                    <select class="form-control" id="audio-playback-source">
-                        <option value="disabled">Disabled</option>
-                        <option value="jpod101">JapanesePod101</option>
-                        <option value="jpod101-alternate">JapanesePod101 (alternate)</option>
-                    </select>
-                </div>
-
-                <div class="form-group options-advanced">
-                    <label for="audio-playback-volume">Audio playback volume (percent)</label>
-                    <input type="number" min="0" max="100" id="audio-playback-volume" class="form-control">
-                </div>
-
-                <div class="form-group options-advanced">
-                    <label for="max-displayed-results">Maximum displayed results</label>
-                    <input type="number" min="1" id="max-displayed-results" class="form-control">
-                </div>
-
-                <div class="form-group options-advanced">
-                    <label>Popup size (width &times; height, in pixels)</label>
-                    <div class="row">
-                        <div class="col-xs-6"><input type="number" min="1" id="popup-width" class="form-control"></div>
-                        <div class="col-xs-6"><input type="number" min="1" id="popup-height" class="form-control"></div>
-                    </div>
-                </div>
-
-                <div class="form-group options-advanced">
-                    <label for="popup-offset">Popup offset (in pixels)</label>
-                    <input type="number" min="0" id="popup-offset" class="form-control">
-                </div>
-            </div>
-
-            <div>
-                <h3>Scanning Options</h3>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="middle-mouse-button-scan"> Middle mouse button scans</label>
-                </div>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="select-matched-text"> Select matched text</label>
-                </div>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="search-alphanumeric"> Search alphanumeric text</label>
-                </div>
-
-                <div class="form-group options-advanced">
-                    <label for="scan-delay">Scan delay (in milliseconds)</label>
-                    <input type="number" min="1" id="scan-delay" class="form-control">
-                </div>
-
-                <div class="form-group options-advanced">
-                    <label for="scan-length">Scan length (in characters)</label>
-                    <input type="number" min="1" id="scan-length" class="form-control">
-                </div>
-
-                <div class="form-group">
-                    <label for="scan-modifier-key">Scan modifier key</label>
-                    <select class="form-control" id="scan-modifier-key">
-                        <option value="none">None</option>
-                        <option value="alt">Alt</option>
-                        <option value="ctrl">Ctrl</option>
-                        <option value="shift">Shift</option>
-                    </select>
-                </div>
-            </div>
-
-            <div>
-                <div>
-                    <img src="/mixed/img/spinner.gif" class="pull-right" id="dict-spinner" alt>
-                    <h3>Dictionaries</h3>
-                </div>
-
-                <p class="help-block">
-                    Yomichan can import and use a variety of dictionary formats. Unneeded dictionaries can be disabled,
-                    or you can simply <a href="#" id="dict-purge">purge the database</a> to delete everything.
-                </p>
-                <p class="help-block">
-                    Please visit the <a href="https://foosoft.net/projects/yomichan" target="_blank">Yomichan</a> homepage to download free
-                    dictionaries that you can use with this extension.
-                </p>
-
-                <div id="dict-purge-progress" class="text-danger">Dictionary data is being purged, please be patient...</div>
-
-                <div class="alert alert-warning" id="dict-warning">
-                    <strong>Warning:</strong>
-                    <span>no dictionaries found; please use the importer below to install packaged dictionaries</span>
-                </div>
-
-                <div class="alert alert-danger" id="dict-error">
-                    <strong>Error:</strong>
-                    <span></span>
-                </div>
-
-                <div id="dict-groups"></div>
-
-                <div id="dict-import-progress">
-                    Dictionary data is being imported, please be patient...
-                    <div class="progress">
-                        <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
-                    </div>
-                </div>
-
-                <div id="dict-importer">
-                    <input type="file" id="dict-file">
-                </div>
-            </div>
-
-            <div>
-                <div>
-                    <img src="/mixed/img/spinner.gif" class="pull-right" id="anki-spinner" alt>
-                    <h3>Anki Options</h3>
-                </div>
-
-                <p class="help-block">
-                    Yomichan supports automatic flashcard creation for <a href="http://ankisrs.net/" target="_blank">Anki</a>, a free application
-                    designed to help you remember. This feature requires installation of the
-                    <a href="https://foosoft.net/projects/anki-connect/" target="_blank">AnkiConnect</a> plugin.
-                </p>
-
-                <div class="alert alert-danger" id="anki-error">
-                    <strong>Error:</strong>
-                    <span></span>
-                </div>
-
-                <div class="checkbox">
-                    <label><input type="checkbox" id="anki-enable"> Enable Anki integration</label>
-                </div>
-
-                <div id="anki-general">
-                    <div class="checkbox options-advanced">
-                        <label><input type="checkbox" id="generate-html-cards"> Generate HTML cards</label>
-                    </div>
-
-                    <div class="form-group">
-                        <label for="card-tags">Card tags (comma or space separated)</label>
-                        <input type="text" id="card-tags" class="form-control">
-                    </div>
-
-                    <div class="form-group options-advanced">
-                        <label for="sentence-detection-extent">Sentence detection extent (in characters)</label>
-                        <input type="number" min="1" id="sentence-detection-extent" class="form-control">
-                    </div>
-
-                    <div class="form-group options-advanced">
-                        <label for="interface-server">Interface server</label>
-                        <input type="text" id="interface-server" class="form-control">
-                    </div>
-
-                    <div id="anki-format">
-                        <p class="help-block">
-                            Specify the information you would like included in your flashcards in the field editor below.
-                            As Anki requires the first field in the model to be unique, it is recommended
-                            that you set it to <code>{expression}</code> for term flashcards and <code>{character}</code> for
-                            Kanji flashcards. You can use multiple markers per field by typing them in directly.
-                        </p>
-
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a href="#terms" data-toggle="tab">Terms</a></li>
-                            <li><a href="#kanji" data-toggle="tab">Kanji</a></li>
-                        </ul>
-
-                        <div class="tab-content">
-                            <div id="terms" class="tab-pane fade in active">
-                                <div class="row">
-                                    <div class="form-group col-xs-6">
-                                        <label for="anki-terms-deck">Deck</label>
-                                        <select class="form-control anki-deck" id="anki-terms-deck"></select>
-                                    </div>
-
-                                    <div class="form-group col-xs-6">
-                                        <label for="anki-terms-model">Model</label>
-                                        <select class="form-control anki-model" id="anki-terms-model"></select>
-                                    </div>
-                                </div>
-
-                                <table class="table table-bordered anki-fields">
-                                    <thead><tr><th>Field</th><th>Value</th></tr></thead>
-                                    <tbody></tbody>
-                                </table>
-                            </div>
-
-                            <div id="kanji" class="tab-pane fade">
-                                <div class="row">
-                                    <div class="form-group col-xs-6">
-                                        <label for="anki-kanji-deck">Deck</label>
-                                        <select class="form-control anki-deck" id="anki-kanji-deck"></select>
-                                    </div>
-
-                                    <div class="form-group col-xs-6">
-                                        <label for="anki-kanji-model">Model</label>
-                                        <select class="form-control anki-model" id="anki-kanji-model"></select>
-                                    </div>
-                                </div>
-
-                                <table class="table table-bordered anki-fields">
-                                    <thead><tr><th>Field</th><th>Value</th></tr></thead>
-                                    <tbody></tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div>
-                    <h3>Support Development</h3>
-
-                    <p class="help-block">
-                        Yomichan is provided to you <em>completely free</em> of charge. Unlike numerous other "free" services, you are not
-                        shown ads, pestered with "offers", or have your browser usage information analyzed and sold to third parties.
-                    </p>
-                    <p class="help-block">
-                        If you find Yomichan useful, please consider making a small donation as a way to show your appreciation for the
-                        countless hours that I have devoted to this extension.
-                    </p>
-                    <p>
-                        <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN" target="_blank"><img src="/bg/img/paypal.gif" alt></a>
-                    </p>
-                </div>
-
-                <pre id="debug"></pre>
-            </div>
-
-            <div class="pull-right">
-                <small><a href="https://foosoft.net/projects/yomichan/" target="_blank">Homepage</a> &bull; <a href="legal.html">Legal</a></small>
-            </div>
-        </div>
-
-        <script src="/mixed/lib/jquery.min.js"></script>
-        <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
-        <script src="/mixed/lib/handlebars.min.js"></script>
-        <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/util.js"></script>
-        <script src="/bg/js/options.js"></script>
-    </body>
-</html>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
new file mode 100644
index 00000000..19dfec22
--- /dev/null
+++ b/ext/bg/settings.html
@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>Yomichan Options</title>
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
+        <style>
+            #anki-spinner, #anki-general, #anki-error,
+            #dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress,
+            #debug,
+            .options-advanced {
+                display: none;
+            }
+
+            .tab-content {
+                border-bottom: 1px #ddd solid;
+                border-left: 1px #ddd solid;
+                border-right: 1px #ddd solid;
+                padding: 10px;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="container-fluid">
+            <div>
+                <h3>General Options</h3>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="show-usage-guide"> Show usage guide on startup</label>
+                </div>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="group-terms-results"> Group term results</label>
+                </div>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="show-advanced-options"> Show advanced options</label>
+                </div>
+
+                <div class="checkbox options-advanced">
+                    <label><input type="checkbox" id="show-debug-info"> Show debug information</label>
+                </div>
+
+                <div class="form-group">
+                    <label for="audio-playback-source">Audio playback source</label>
+                    <select class="form-control" id="audio-playback-source">
+                        <option value="disabled">Disabled</option>
+                        <option value="jpod101">JapanesePod101</option>
+                        <option value="jpod101-alternate">JapanesePod101 (alternate)</option>
+                    </select>
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label for="audio-playback-volume">Audio playback volume (percent)</label>
+                    <input type="number" min="0" max="100" id="audio-playback-volume" class="form-control">
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label for="max-displayed-results">Maximum displayed results</label>
+                    <input type="number" min="1" id="max-displayed-results" class="form-control">
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label>Popup size (width &times; height, in pixels)</label>
+                    <div class="row">
+                        <div class="col-xs-6"><input type="number" min="1" id="popup-width" class="form-control"></div>
+                        <div class="col-xs-6"><input type="number" min="1" id="popup-height" class="form-control"></div>
+                    </div>
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label for="popup-offset">Popup offset (in pixels)</label>
+                    <input type="number" min="0" id="popup-offset" class="form-control">
+                </div>
+            </div>
+
+            <div>
+                <h3>Scanning Options</h3>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="middle-mouse-button-scan"> Middle mouse button scans</label>
+                </div>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="select-matched-text"> Select matched text</label>
+                </div>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="search-alphanumeric"> Search alphanumeric text</label>
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label for="scan-delay">Scan delay (in milliseconds)</label>
+                    <input type="number" min="1" id="scan-delay" class="form-control">
+                </div>
+
+                <div class="form-group options-advanced">
+                    <label for="scan-length">Scan length (in characters)</label>
+                    <input type="number" min="1" id="scan-length" class="form-control">
+                </div>
+
+                <div class="form-group">
+                    <label for="scan-modifier-key">Scan modifier key</label>
+                    <select class="form-control" id="scan-modifier-key">
+                        <option value="none">None</option>
+                        <option value="alt">Alt</option>
+                        <option value="ctrl">Ctrl</option>
+                        <option value="shift">Shift</option>
+                    </select>
+                </div>
+            </div>
+
+            <div>
+                <div>
+                    <img src="/mixed/img/spinner.gif" class="pull-right" id="dict-spinner" alt>
+                    <h3>Dictionaries</h3>
+                </div>
+
+                <p class="help-block">
+                    Yomichan can import and use a variety of dictionary formats. Unneeded dictionaries can be disabled,
+                    or you can simply <a href="#" id="dict-purge">purge the database</a> to delete everything.
+                </p>
+                <p class="help-block">
+                    Please visit the <a href="https://foosoft.net/projects/yomichan" target="_blank">Yomichan</a> homepage to download free
+                    dictionaries that you can use with this extension.
+                </p>
+
+                <div id="dict-purge-progress" class="text-danger">Dictionary data is being purged, please be patient...</div>
+
+                <div class="alert alert-warning" id="dict-warning">
+                    <strong>Warning:</strong>
+                    <span>no dictionaries found; please use the importer below to install packaged dictionaries</span>
+                </div>
+
+                <div class="alert alert-danger" id="dict-error">
+                    <strong>Error:</strong>
+                    <span></span>
+                </div>
+
+                <div id="dict-groups"></div>
+
+                <div id="dict-import-progress">
+                    Dictionary data is being imported, please be patient...
+                    <div class="progress">
+                        <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
+                    </div>
+                </div>
+
+                <div id="dict-importer">
+                    <input type="file" id="dict-file">
+                </div>
+            </div>
+
+            <div>
+                <div>
+                    <img src="/mixed/img/spinner.gif" class="pull-right" id="anki-spinner" alt>
+                    <h3>Anki Options</h3>
+                </div>
+
+                <p class="help-block">
+                    Yomichan supports automatic flashcard creation for <a href="http://ankisrs.net/" target="_blank">Anki</a>, a free application
+                    designed to help you remember. This feature requires installation of the
+                    <a href="https://foosoft.net/projects/anki-connect/" target="_blank">AnkiConnect</a> plugin.
+                </p>
+
+                <div class="alert alert-danger" id="anki-error">
+                    <strong>Error:</strong>
+                    <span></span>
+                </div>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="anki-enable"> Enable Anki integration</label>
+                </div>
+
+                <div id="anki-general">
+                    <div class="checkbox options-advanced">
+                        <label><input type="checkbox" id="generate-html-cards"> Generate HTML cards</label>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="card-tags">Card tags (comma or space separated)</label>
+                        <input type="text" id="card-tags" class="form-control">
+                    </div>
+
+                    <div class="form-group options-advanced">
+                        <label for="sentence-detection-extent">Sentence detection extent (in characters)</label>
+                        <input type="number" min="1" id="sentence-detection-extent" class="form-control">
+                    </div>
+
+                    <div class="form-group options-advanced">
+                        <label for="interface-server">Interface server</label>
+                        <input type="text" id="interface-server" class="form-control">
+                    </div>
+
+                    <div id="anki-format">
+                        <p class="help-block">
+                            Specify the information you would like included in your flashcards in the field editor below.
+                            As Anki requires the first field in the model to be unique, it is recommended
+                            that you set it to <code>{expression}</code> for term flashcards and <code>{character}</code> for
+                            Kanji flashcards. You can use multiple markers per field by typing them in directly.
+                        </p>
+
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a href="#terms" data-toggle="tab">Terms</a></li>
+                            <li><a href="#kanji" data-toggle="tab">Kanji</a></li>
+                        </ul>
+
+                        <div class="tab-content">
+                            <div id="terms" class="tab-pane fade in active">
+                                <div class="row">
+                                    <div class="form-group col-xs-6">
+                                        <label for="anki-terms-deck">Deck</label>
+                                        <select class="form-control anki-deck" id="anki-terms-deck"></select>
+                                    </div>
+
+                                    <div class="form-group col-xs-6">
+                                        <label for="anki-terms-model">Model</label>
+                                        <select class="form-control anki-model" id="anki-terms-model"></select>
+                                    </div>
+                                </div>
+
+                                <table class="table table-bordered anki-fields">
+                                    <thead><tr><th>Field</th><th>Value</th></tr></thead>
+                                    <tbody></tbody>
+                                </table>
+                            </div>
+
+                            <div id="kanji" class="tab-pane fade">
+                                <div class="row">
+                                    <div class="form-group col-xs-6">
+                                        <label for="anki-kanji-deck">Deck</label>
+                                        <select class="form-control anki-deck" id="anki-kanji-deck"></select>
+                                    </div>
+
+                                    <div class="form-group col-xs-6">
+                                        <label for="anki-kanji-model">Model</label>
+                                        <select class="form-control anki-model" id="anki-kanji-model"></select>
+                                    </div>
+                                </div>
+
+                                <table class="table table-bordered anki-fields">
+                                    <thead><tr><th>Field</th><th>Value</th></tr></thead>
+                                    <tbody></tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div>
+                    <h3>Support Development</h3>
+
+                    <p class="help-block">
+                        Yomichan is provided to you <em>completely free</em> of charge. Unlike numerous other "free" services, you are not
+                        shown ads, pestered with "offers", or have your browser usage information analyzed and sold to third parties.
+                    </p>
+                    <p class="help-block">
+                        If you find Yomichan useful, please consider making a small donation as a way to show your appreciation for the
+                        countless hours that I have devoted to this extension.
+                    </p>
+                    <p>
+                        <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN" target="_blank"><img src="/bg/img/paypal.gif" alt></a>
+                    </p>
+                </div>
+
+                <pre id="debug"></pre>
+            </div>
+
+            <div class="pull-right">
+                <small><a href="https://foosoft.net/projects/yomichan/" target="_blank">Homepage</a> &bull; <a href="legal.html">Legal</a></small>
+            </div>
+        </div>
+
+        <script src="/mixed/lib/jquery.min.js"></script>
+        <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
+        <script src="/mixed/lib/handlebars.min.js"></script>
+        <script src="/bg/js/templates.js"></script>
+        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/settings.js"></script>
+    </body>
+</html>
diff --git a/ext/manifest.json b/ext/manifest.json
index ab180faa..be9f3208 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -25,7 +25,7 @@
     }],
     "minimum_chrome_version": "57.0.0.0",
     "options_ui": {
-        "page": "bg/options.html"
+        "page": "bg/settings.html"
     },
     "permissions": [
         "<all_urls>",
-- 
cgit v1.2.3


From 39f1f30dc9e9aaae8cbeac9afe120fbb5c2ecfd3 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 16 Jul 2017 13:14:28 -0700
Subject: refactor bg/js/util.js

---
 ext/bg/background.html |   1 +
 ext/bg/js/options.js   | 132 +++++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/util.js      | 119 --------------------------------------------
 ext/bg/popup.html      |   1 +
 ext/bg/settings.html   |   1 +
 ext/mixed/js/audio.js  |   4 --
 6 files changed, 135 insertions(+), 123 deletions(-)
 create mode 100644 ext/bg/js/options.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 4a2d8c8d..a9071cc7 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -11,6 +11,7 @@
         <script src="/mixed/js/audio.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/options.js"></script>
         <script src="/bg/js/anki-connect.js"></script>
         <script src="/bg/js/anki-null.js"></script>
         <script src="/bg/js/database.js"></script>
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
new file mode 100644
index 00000000..a9345fdd
--- /dev/null
+++ b/ext/bg/js/options.js
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function optionsSetDefaults(options) {
+    const defaults = {
+        general: {
+            enable: true,
+            audioSource: 'jpod101',
+            audioVolume: 100,
+            groupResults: true,
+            debugInfo: false,
+            maxResults: 32,
+            showAdvanced: false,
+            popupWidth: 400,
+            popupHeight: 250,
+            popupOffset: 10,
+            showGuide: true
+        },
+
+        scanning: {
+            middleMouse: true,
+            selectText: true,
+            alphanumeric: true,
+            delay: 15,
+            length: 10,
+            modifier: 'shift'
+        },
+
+        dictionaries: {},
+
+        anki: {
+            enable: false,
+            server: 'http://127.0.0.1:8765',
+            tags: ['yomichan'],
+            htmlCards: true,
+            sentenceExt: 200,
+            terms: {deck: '', model: '', fields: {}},
+            kanji: {deck: '', model: '', fields: {}}
+        }
+    };
+
+    const combine = (target, source) => {
+        for (const key in source) {
+            if (!target.hasOwnProperty(key)) {
+                target[key] = source[key];
+            }
+        }
+    };
+
+    combine(options, defaults);
+    combine(options.general, defaults.general);
+    combine(options.scanning, defaults.scanning);
+    combine(options.anki, defaults.anki);
+    combine(options.anki.terms, defaults.anki.terms);
+    combine(options.anki.kanji, defaults.anki.kanji);
+
+    return options;
+}
+
+function optionsVersion(options) {
+    const fixups = [
+        () => {},
+        () => {},
+        () => {},
+        () => {},
+        () => {
+            if (options.general.audioPlayback) {
+                options.general.audioSource = 'jpod101';
+            } else {
+                options.general.audioSource = 'disabled';
+            }
+        },
+        () => {
+            options.general.showGuide = false;
+        },
+        () => {
+            if (options.scanning.requireShift) {
+                options.scanning.modifier = 'shift';
+            } else {
+                options.scanning.modifier = 'none';
+            }
+        }
+    ];
+
+    optionsSetDefaults(options);
+    if (!options.hasOwnProperty('version')) {
+        options.version = fixups.length;
+    }
+
+    while (options.version < fixups.length) {
+        fixups[options.version++]();
+    }
+
+    return options;
+}
+
+function optionsLoad() {
+    return new Promise((resolve, reject) => {
+        chrome.storage.local.get(null, store => resolve(store.options));
+    }).then(optionsStr => {
+        return optionsStr ? JSON.parse(optionsStr) : {};
+    }).catch(error => {
+        return {};
+    }).then(options => {
+        return optionsVersion(options);
+    });
+}
+
+function optionsSave(options) {
+    return new Promise((resolve, reject) => {
+        chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
+    }).then(() => {
+        instYomi().optionsSet(options);
+        fgOptionsSet(options);
+    });
+}
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 4d0aa27e..5d80fdb7 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -91,125 +91,6 @@ function fgOptionsSet(options) {
 }
 
 
-/*
- * Options
- */
-
-function optionsSetDefaults(options) {
-    const defaults = {
-        general: {
-            enable: true,
-            audioSource: 'jpod101',
-            audioVolume: 100,
-            groupResults: true,
-            debugInfo: false,
-            maxResults: 32,
-            showAdvanced: false,
-            popupWidth: 400,
-            popupHeight: 250,
-            popupOffset: 10,
-            showGuide: true
-        },
-
-        scanning: {
-            middleMouse: true,
-            selectText: true,
-            alphanumeric: true,
-            delay: 15,
-            length: 10,
-            modifier: 'shift'
-        },
-
-        dictionaries: {},
-
-        anki: {
-            enable: false,
-            server: 'http://127.0.0.1:8765',
-            tags: ['yomichan'],
-            htmlCards: true,
-            sentenceExt: 200,
-            terms: {deck: '', model: '', fields: {}},
-            kanji: {deck: '', model: '', fields: {}}
-        }
-    };
-
-    const combine = (target, source) => {
-        for (const key in source) {
-            if (!target.hasOwnProperty(key)) {
-                target[key] = source[key];
-            }
-        }
-    };
-
-    combine(options, defaults);
-    combine(options.general, defaults.general);
-    combine(options.scanning, defaults.scanning);
-    combine(options.anki, defaults.anki);
-    combine(options.anki.terms, defaults.anki.terms);
-    combine(options.anki.kanji, defaults.anki.kanji);
-
-    return options;
-}
-
-function optionsVersion(options) {
-    const fixups = [
-        () => {},
-        () => {},
-        () => {},
-        () => {},
-        () => {
-            if (options.general.audioPlayback) {
-                options.general.audioSource = 'jpod101';
-            } else {
-                options.general.audioSource = 'disabled';
-            }
-        },
-        () => {
-            options.general.showGuide = false;
-        },
-        () => {
-            if (options.scanning.requireShift) {
-                options.scanning.modifier = 'shift';
-            } else {
-                options.scanning.modifier = 'none';
-            }
-        }
-    ];
-
-    optionsSetDefaults(options);
-    if (!options.hasOwnProperty('version')) {
-        options.version = fixups.length;
-    }
-
-    while (options.version < fixups.length) {
-        fixups[options.version++]();
-    }
-
-    return options;
-}
-
-function optionsLoad() {
-    return new Promise((resolve, reject) => {
-        chrome.storage.local.get(null, store => resolve(store.options));
-    }).then(optionsStr => {
-        return optionsStr ? JSON.parse(optionsStr) : {};
-    }).catch(error => {
-        return {};
-    }).then(options => {
-        return optionsVersion(options);
-    });
-}
-
-function optionsSave(options) {
-    return new Promise((resolve, reject) => {
-        chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
-    }).then(() => {
-        instYomi().optionsSet(options);
-        fgOptionsSet(options);
-    });
-}
-
-
 /*
  * Dictionary
  */
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index dec52795..ab2ee1e0 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -31,6 +31,7 @@
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/options.js"></script>
         <script src="/bg/js/popup.js"></script>
     </body>
 </html>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 19dfec22..ada3299b 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -277,6 +277,7 @@
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/options.js"></script>
         <script src="/bg/js/settings.js"></script>
     </body>
 </html>
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
index 451fe1d9..eb8fde94 100644
--- a/ext/mixed/js/audio.js
+++ b/ext/mixed/js/audio.js
@@ -17,10 +17,6 @@
  */
 
 
-/*
- * Audio
- */
-
 async function audioBuildUrl(definition, mode, cache={}) {
     if (mode === 'jpod101') {
         let kana = definition.reading;
-- 
cgit v1.2.3


From a22facec98caedce379bdc5ac34c3586c08c41a2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 16 Jul 2017 19:29:43 -0700
Subject: refactor options page

---
 ext/bg/js/settings.js | 426 ++++++++++++++++++++++++++------------------------
 1 file changed, 226 insertions(+), 200 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index e105f1b2..f48afa2c 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -21,53 +21,52 @@
  * General
  */
 
-function formRead() {
-    return optionsLoad().then(optionsOld => {
-        const optionsNew = $.extend(true, {}, optionsOld);
-
-        optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
-        optionsNew.general.audioSource = $('#audio-playback-source').val();
-        optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
-        optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
-        optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
-        optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
-        optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
-        optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
-        optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
-        optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
-
-        optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
-        optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
-        optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
-        optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
-        optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
-        optionsNew.scanning.modifier = $('#scan-modifier-key').val();
-
-        optionsNew.anki.enable = $('#anki-enable').prop('checked');
-        optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
-        optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
-        optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
-        optionsNew.anki.server = $('#interface-server').val();
-
-        if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
-            optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
-            optionsNew.anki.terms.model = $('#anki-terms-model').val();
-            optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
-            optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
-            optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
-            optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
-        }
-
-        $('.dict-group').each((index, element) => {
-            const dictionary = $(element);
-            const title = dictionary.data('title');
-            const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
-            const enabled = dictionary.find('.dict-enabled').prop('checked');
-            optionsNew.dictionaries[title] = {priority, enabled};
-        });
+async function formRead() {
+    const optionsOld = await optionsLoad();
+    const optionsNew = $.extend(true, {}, optionsOld);
+
+    optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
+    optionsNew.general.audioSource = $('#audio-playback-source').val();
+    optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
+    optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
+    optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
+    optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
+    optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
+    optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
+    optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
+    optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
+
+    optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
+    optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
+    optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
+    optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
+    optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
+    optionsNew.scanning.modifier = $('#scan-modifier-key').val();
+
+    optionsNew.anki.enable = $('#anki-enable').prop('checked');
+    optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
+    optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
+    optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
+    optionsNew.anki.server = $('#interface-server').val();
+
+    if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
+        optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
+        optionsNew.anki.terms.model = $('#anki-terms-model').val();
+        optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
+        optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
+        optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
+        optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+    }
 
-        return {optionsNew, optionsOld};
+    $('.dict-group').each((index, element) => {
+        const dictionary = $(element);
+        const title = dictionary.data('title');
+        const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
+        const enabled = dictionary.find('.dict-enabled').prop('checked');
+        optionsNew.dictionaries[title] = {priority, enabled};
     });
+
+    return {optionsNew, optionsOld};
 }
 
 function updateVisibility(options) {
@@ -95,66 +94,84 @@ function updateVisibility(options) {
     }
 }
 
-function onOptionsChanged(e) {
+async function onOptionsChanged(e) { (async () => {
     if (!e.originalEvent && !e.isTrigger) {
         return;
     }
 
-    formRead().then(({optionsNew, optionsOld}) => {
-        return optionsSave(optionsNew).then(() => {
-            updateVisibility(optionsNew);
+    try {
+        ankiErrorShow();
+        ankiSpinnerShow(true);
 
-            const ankiUpdated =
-                optionsNew.anki.enable !== optionsOld.anki.enable ||
-                optionsNew.anki.server !== optionsOld.anki.server;
+        const {optionsNew, optionsOld} = await formRead();
+        await optionsSave(optionsNew);
 
-            if (ankiUpdated) {
-                ankiErrorShow(null);
-                ankiSpinnerShow(true);
-                return ankiDeckAndModelPopulate(optionsNew);
-            }
-        });
-    }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-}
+        updateVisibility(optionsNew);
 
-$(document).ready(() => {
+        const ankiUpdated =
+            optionsNew.anki.enable !== optionsOld.anki.enable ||
+            optionsNew.anki.server !== optionsOld.anki.server;
+
+        if (ankiUpdated) {
+            await ankiDeckAndModelPopulate(optionsNew);
+        }
+    } catch (e) {
+        ankiErrorShow(e);
+    } finally {
+        ankiSpinnerShow(false);
+    }
+})();}
+
+function onReady() {(async () => {
     handlebarsRegister();
 
-    optionsLoad().then(options => {
-        $('#show-usage-guide').prop('checked', options.general.showGuide);
-        $('#audio-playback-source').val(options.general.audioSource);
-        $('#audio-playback-volume').val(options.general.audioVolume);
-        $('#group-terms-results').prop('checked', options.general.groupResults);
-        $('#show-debug-info').prop('checked', options.general.debugInfo);
-        $('#show-advanced-options').prop('checked', options.general.showAdvanced);
-        $('#max-displayed-results').val(options.general.maxResults);
-        $('#popup-width').val(options.general.popupWidth);
-        $('#popup-height').val(options.general.popupHeight);
-        $('#popup-offset').val(options.general.popupOffset);
-
-        $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
-        $('#select-matched-text').prop('checked', options.scanning.selectText);
-        $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
-        $('#scan-delay').val(options.scanning.delay);
-        $('#scan-length').val(options.scanning.length);
-        $('#scan-modifier-key').val(options.scanning.modifier);
-
-        $('#dict-purge').click(onDictionaryPurge);
-        $('#dict-file').change(onDictionaryImport);
-
-        $('#anki-enable').prop('checked', options.anki.enable);
-        $('#card-tags').val(options.anki.tags.join(' '));
-        $('#generate-html-cards').prop('checked', options.anki.htmlCards);
-        $('#sentence-detection-extent').val(options.anki.sentenceExt);
-        $('#interface-server').val(options.anki.server);
-        $('input, select').not('.anki-model').change(onOptionsChanged);
-        $('.anki-model').change(onAnkiModelChanged);
-
-        dictionaryGroupsPopulate(options);
-        ankiDeckAndModelPopulate(options);
-        updateVisibility(options);
-    });
-});
+    const options = await optionsLoad();
+
+    $('#show-usage-guide').prop('checked', options.general.showGuide);
+    $('#audio-playback-source').val(options.general.audioSource);
+    $('#audio-playback-volume').val(options.general.audioVolume);
+    $('#group-terms-results').prop('checked', options.general.groupResults);
+    $('#show-debug-info').prop('checked', options.general.debugInfo);
+    $('#show-advanced-options').prop('checked', options.general.showAdvanced);
+    $('#max-displayed-results').val(options.general.maxResults);
+    $('#popup-width').val(options.general.popupWidth);
+    $('#popup-height').val(options.general.popupHeight);
+    $('#popup-offset').val(options.general.popupOffset);
+
+    $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
+    $('#select-matched-text').prop('checked', options.scanning.selectText);
+    $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
+    $('#scan-delay').val(options.scanning.delay);
+    $('#scan-length').val(options.scanning.length);
+    $('#scan-modifier-key').val(options.scanning.modifier);
+
+    $('#dict-purge').click(onDictionaryPurge);
+    $('#dict-file').change(onDictionaryImport);
+
+    $('#anki-enable').prop('checked', options.anki.enable);
+    $('#card-tags').val(options.anki.tags.join(' '));
+    $('#generate-html-cards').prop('checked', options.anki.htmlCards);
+    $('#sentence-detection-extent').val(options.anki.sentenceExt);
+    $('#interface-server').val(options.anki.server);
+    $('input, select').not('.anki-model').change(onOptionsChanged);
+    $('.anki-model').change(onAnkiModelChanged);
+
+    try {
+        await dictionaryGroupsPopulate(options);
+    } catch (e) {
+        dictionaryErrorShow(e);
+    }
+
+    try {
+        await ankiDeckAndModelPopulate(options);
+    } catch (e) {
+        ankiErrorShow(e);
+    }
+
+    updateVisibility(options);
+})();}
+
+$(document).ready(onReady);
 
 
 /*
@@ -196,84 +213,91 @@ function dictionaryGroupsSort() {
     dictGroups.append(dictGroupChildren);
 }
 
-function dictionaryGroupsPopulate(options) {
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
+async function dictionaryGroupsPopulate(options) {
     const dictGroups = $('#dict-groups').empty();
     const dictWarning = $('#dict-warning').hide();
 
-    return instDb().getDictionaries().then(rows => {
-        if (rows.length === 0) {
-            dictWarning.show();
-        }
+    const dictRows = await instDb().getDictionaries();
+    if (dictRows.length === 0) {
+        dictWarning.show();
+    }
 
-        for (const row of dictRowsSort(rows, options)) {
-            const dictOptions = options.dictionaries[row.title] || {enabled: false, priority: 0};
-            const dictHtml = handlebarsRender('dictionary.html', {
-                title: row.title,
-                version: row.version,
-                revision: row.revision,
-                priority: dictOptions.priority,
-                enabled: dictOptions.enabled
-            });
-
-            dictGroups.append($(dictHtml));
-        }
+    for (const dictRow of dictRowsSort(dictRows, options)) {
+        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0};
+        const dictHtml = handlebarsRender('dictionary.html', {
+            title: dictRow.title,
+            version: dictRow.version,
+            revision: dictRow.revision,
+            priority: dictOptions.priority,
+            enabled: dictOptions.enabled
+        });
 
-        updateVisibility(options);
+        dictGroups.append($(dictHtml));
+    }
 
-        $('.dict-enabled, .dict-priority').change(e => {
-            dictionaryGroupsSort();
-            onOptionsChanged(e);
-        });
-    }).catch(dictionaryErrorShow).then(() => dictionarySpinnerShow(false));
+    updateVisibility(options);
+
+    $('.dict-enabled, .dict-priority').change(e => {
+        dictionaryGroupsSort();
+        onOptionsChanged(e);
+    });
 }
 
-function onDictionaryPurge(e) {
+async function onDictionaryPurge(e) { (async () => {
     e.preventDefault();
 
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
     const dictControls = $('#dict-importer, #dict-groups').hide();
     const dictProgress = $('#dict-purge-progress').show();
 
-    instDb().purge().catch(dictionaryErrorShow).then(() => {
+    try {
+        dictionaryErrorShow();
+        dictionarySpinnerShow(true);
+
+        await instDb().purge();
+        const options = await optionsLoad();
+        options.dictionaries = {};
+        await optionsSave(options);
+
+        await dictionaryGroupsPopulate(options);
+    } catch (e) {
+        dictionaryErrorShow(e);
+    } finally {
         dictionarySpinnerShow(false);
+
         dictControls.show();
         dictProgress.hide();
-        return optionsLoad();
-    }).then(options => {
-        options.dictionaries = {};
-        optionsSave(options).then(() => dictionaryGroupsPopulate(options));
-    });
-}
-
-function onDictionaryImport(e) {
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
+    }
+})();}
 
+function onDictionaryImport(e) { (async () => {
     const dictFile = $('#dict-file');
-    const dictImporter = $('#dict-importer').hide();
+    const dictControls = $('#dict-importer').hide();
     const dictProgress = $('#dict-import-progress').show();
-    const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
-    const updateProgress = (total, current) => setProgress(current / total * 100.0);
 
-    setProgress(0.0);
+    try {
+        dictionaryErrorShow();
+        dictionarySpinnerShow(true);
 
-    optionsLoad().then(options => {
-        return instDb().importDictionary(e.target.files[0], updateProgress).then(summary => {
-            options.dictionaries[summary.title] = {enabled: true, priority: 0};
-            return optionsSave(options);
-        }).then(() => dictionaryGroupsPopulate(options));
-    }).catch(dictionaryErrorShow).then(() => {
-        dictFile.val('');
+        const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
+        const updateProgress = (total, current) => setProgress(current / total * 100.0);
+        setProgress(0.0);
+
+        const options = await optionsLoad();
+        const summary = await instDb().importDictionary(e.target.files[0], updateProgress);
+        options.dictionaries[summary.title] = {enabled: true, priority: 0};
+        await optionsSave(options);
+
+        await dictionaryGroupsPopulate(options);
+    } catch (e) {
+        dictionaryErrorShow(e);
+    } finally {
         dictionarySpinnerShow(false);
+
+        dictFile.val('');
+        dictControls.show();
         dictProgress.hide();
-        dictImporter.show();
-    });
-}
+    }
+})();}
 
 /*
  * Anki
@@ -307,40 +331,38 @@ function ankiFieldsToDict(selection) {
     return result;
 }
 
-function ankiDeckAndModelPopulate(options) {
-    ankiErrorShow(null);
-    ankiSpinnerShow(true);
-
+async function ankiDeckAndModelPopulate(options) {
     const ankiFormat = $('#anki-format').hide();
-    return Promise.all([instAnki().getDeckNames(), instAnki().getModelNames()]).then(([deckNames, modelNames]) => {
-        const ankiDeck = $('.anki-deck');
-        ankiDeck.find('option').remove();
-        deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
-
-        $('#anki-terms-deck').val(options.anki.terms.deck);
-        $('#anki-kanji-deck').val(options.anki.kanji.deck);
-
-        const ankiModel = $('.anki-model');
-        ankiModel.find('option').remove();
-        modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
-
-        return Promise.all([
-            ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options),
-            ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options)
-        ]);
-    }).then(() => ankiFormat.show()).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-}
 
-function ankiFieldsPopulate(element, options) {
-    const tab = element.closest('.tab-pane');
-    const tabId = tab.attr('id');
-    const container = tab.find('tbody').empty();
+    const deckNames = await instAnki().getDeckNames();
+    const ankiDeck = $('.anki-deck');
+    ankiDeck.find('option').remove();
+    deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
+
+    const modelNames = await instAnki().getModelNames();
+    const ankiModel = $('.anki-model');
+    ankiModel.find('option').remove();
+    modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
 
+    $('#anki-terms-deck').val(options.anki.terms.deck);
+    await ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options);
+
+    $('#anki-kanji-deck').val(options.anki.kanji.deck);
+    await ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options);
+
+    ankiFormat.show();
+}
+
+async function ankiFieldsPopulate(element, options) {
     const modelName = element.val();
     if (!modelName) {
-        return Promise.resolve();
+        return;
     }
 
+    const tab = element.closest('.tab-pane');
+    const tabId = tab.attr('id');
+    const container = tab.find('tbody').empty();
+
     const markers = {
         'terms': [
             'audio',
@@ -369,37 +391,41 @@ function ankiFieldsPopulate(element, options) {
         ]
     }[tabId] || {};
 
-    return instAnki().getModelFieldNames(modelName).then(names => {
-        names.forEach(name => {
-            const value = options.anki[tabId].fields[name] || '';
-            const html = Handlebars.templates['model.html']({name, markers, value});
-            container.append($(html));
-        });
+    for (const name of await instAnki().getModelFieldNames(modelName)) {
+        const value = options.anki[tabId].fields[name] || '';
+        const html = Handlebars.templates['model.html']({name, markers, value});
+        container.append($(html));
+    }
 
-        tab.find('.anki-field-value').change(onOptionsChanged);
-        tab.find('.marker-link').click(e => {
-            e.preventDefault();
-            const link = e.target;
-            $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
-        });
+    tab.find('.anki-field-value').change(onOptionsChanged);
+    tab.find('.marker-link').click(e => {
+        e.preventDefault();
+        const link = e.target;
+        $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
     });
 }
 
-function onAnkiModelChanged(e) {
+function onAnkiModelChanged(e) { (async () => {
     if (!e.originalEvent) {
         return;
     }
 
-    ankiErrorShow(null);
-    ankiSpinnerShow(true);
+    try {
+        ankiErrorShow();
+        ankiSpinnerShow(true);
 
-    const element = $(this);
-    formRead().then(({optionsNew, optionsOld}) => {
+        const element = $(this);
         const tab = element.closest('.tab-pane');
         const tabId = tab.attr('id');
+
+        const {optionsNew, optionsOld} = await formRead();
         optionsNew.anki[tabId].fields = {};
-        ankiFieldsPopulate(element, optionsNew).then(() => {
-            optionsSave(optionsNew);
-        }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-    });
-}
+        await optionsSave(optionsNew);
+
+        await ankiFieldsPopulate(element, optionsNew);
+    } catch (e) {
+        ankiErrorShow(e);
+    } finally {
+        ankiSpinnerShow(false);
+    }
+})();}
-- 
cgit v1.2.3


From dcaf345549b3a5708b97d639bb64363df2eb5c90 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 16 Jul 2017 19:55:33 -0700
Subject: cleanup

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

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index f48afa2c..b187fd33 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -49,7 +49,7 @@ async function formRead() {
     optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
     optionsNew.anki.server = $('#interface-server').val();
 
-    if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
+    if (optionsOld.anki.enable && !ankiErrorShown()) {
         optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
         optionsNew.anki.terms.model = $('#anki-terms-model').val();
         optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
@@ -69,7 +69,7 @@ async function formRead() {
     return {optionsNew, optionsOld};
 }
 
-function updateVisibility(options) {
+function formUpdateVisibility(options) {
     const general = $('#anki-general');
     if (options.anki.enable) {
         general.show();
@@ -94,7 +94,7 @@ function updateVisibility(options) {
     }
 }
 
-async function onOptionsChanged(e) { (async () => {
+async function onFormOptionsChanged(e) { (async () => {
     if (!e.originalEvent && !e.isTrigger) {
         return;
     }
@@ -106,7 +106,7 @@ async function onOptionsChanged(e) { (async () => {
         const {optionsNew, optionsOld} = await formRead();
         await optionsSave(optionsNew);
 
-        updateVisibility(optionsNew);
+        formUpdateVisibility(optionsNew);
 
         const ankiUpdated =
             optionsNew.anki.enable !== optionsOld.anki.enable ||
@@ -153,7 +153,7 @@ function onReady() {(async () => {
     $('#generate-html-cards').prop('checked', options.anki.htmlCards);
     $('#sentence-detection-extent').val(options.anki.sentenceExt);
     $('#interface-server').val(options.anki.server);
-    $('input, select').not('.anki-model').change(onOptionsChanged);
+    $('input, select').not('.anki-model').change(onFormOptionsChanged);
     $('.anki-model').change(onAnkiModelChanged);
 
     try {
@@ -168,7 +168,7 @@ function onReady() {(async () => {
         ankiErrorShow(e);
     }
 
-    updateVisibility(options);
+    formUpdateVisibility(options);
 })();}
 
 $(document).ready(onReady);
@@ -235,11 +235,11 @@ async function dictionaryGroupsPopulate(options) {
         dictGroups.append($(dictHtml));
     }
 
-    updateVisibility(options);
+    formUpdateVisibility(options);
 
     $('.dict-enabled, .dict-priority').change(e => {
         dictionaryGroupsSort();
-        onOptionsChanged(e);
+        onFormOptionsChanged(e);
     });
 }
 
@@ -322,6 +322,10 @@ function ankiErrorShow(error) {
     }
 }
 
+function ankiErrorShown() {
+    return $('#anki-error').is(':visible');
+}
+
 function ankiFieldsToDict(selection) {
     const result = {};
     selection.each((index, element) => {
@@ -333,6 +337,11 @@ function ankiFieldsToDict(selection) {
 
 async function ankiDeckAndModelPopulate(options) {
     const ankiFormat = $('#anki-format').hide();
+    const ankiTermsModel = $('#anki-terms-model').val(options.anki.terms.model);
+    const ankiKanjiModel = $('#anki-kanji-model').val(options.anki.kanji.model);
+
+    $('#anki-terms-deck').val(options.anki.terms.deck);
+    $('#anki-kanji-deck').val(options.anki.kanji.deck);
 
     const deckNames = await instAnki().getDeckNames();
     const ankiDeck = $('.anki-deck');
@@ -344,11 +353,8 @@ async function ankiDeckAndModelPopulate(options) {
     ankiModel.find('option').remove();
     modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
 
-    $('#anki-terms-deck').val(options.anki.terms.deck);
-    await ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options);
-
-    $('#anki-kanji-deck').val(options.anki.kanji.deck);
-    await ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options);
+    await ankiFieldsPopulate(ankiTermsModel, options);
+    await ankiFieldsPopulate(ankiKanjiModel, options);
 
     ankiFormat.show();
 }
@@ -397,12 +403,14 @@ async function ankiFieldsPopulate(element, options) {
         container.append($(html));
     }
 
-    tab.find('.anki-field-value').change(onOptionsChanged);
-    tab.find('.marker-link').click(e => {
-        e.preventDefault();
-        const link = e.target;
-        $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
-    });
+    tab.find('.anki-field-value').change(onFormOptionsChanged);
+    tab.find('.marker-link').click(onAnkiMarkerClicked);
+}
+
+function onAnkiMarkerClicked(e) {
+    e.preventDefault();
+    const link = e.target;
+    $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
 }
 
 function onAnkiModelChanged(e) { (async () => {
-- 
cgit v1.2.3


From c4a39da766e0e7ff11b5fc157321b52f4d62985c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 16 Jul 2017 23:56:36 -0700
Subject: .

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

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index b187fd33..0ef8c21f 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -299,6 +299,7 @@ function onDictionaryImport(e) { (async () => {
     }
 })();}
 
+
 /*
  * Anki
  */
-- 
cgit v1.2.3


From f6077c4242b83bc10c2ca74be30bea5ff6ab353c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 17 Jul 2017 00:00:38 -0700
Subject: .

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

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 0ef8c21f..3cd64fbd 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -94,7 +94,7 @@ function formUpdateVisibility(options) {
     }
 }
 
-async function onFormOptionsChanged(e) { (async () => {
+async function onFormOptionsChanged(e) {(async () => {
     if (!e.originalEvent && !e.isTrigger) {
         return;
     }
@@ -243,7 +243,7 @@ async function dictionaryGroupsPopulate(options) {
     });
 }
 
-async function onDictionaryPurge(e) { (async () => {
+async function onDictionaryPurge(e) {(async () => {
     e.preventDefault();
 
     const dictControls = $('#dict-importer, #dict-groups').hide();
@@ -269,7 +269,7 @@ async function onDictionaryPurge(e) { (async () => {
     }
 })();}
 
-function onDictionaryImport(e) { (async () => {
+function onDictionaryImport(e) {(async () => {
     const dictFile = $('#dict-file');
     const dictControls = $('#dict-importer').hide();
     const dictProgress = $('#dict-import-progress').show();
@@ -414,7 +414,7 @@ function onAnkiMarkerClicked(e) {
     $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
 }
 
-function onAnkiModelChanged(e) { (async () => {
+function onAnkiModelChanged(e) {(async () => {
     if (!e.originalEvent) {
         return;
     }
-- 
cgit v1.2.3


From 26e1cc517f6100fe665d8d066729a11fde2cdc26 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 18 Jul 2017 23:07:46 -0700
Subject: refactor

---
 ext/bg/background.html   |   2 +
 ext/bg/js/dictionary.js  | 233 ++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/util.js        | 237 -----------------------------------------------
 ext/bg/popup.html        |   2 +
 ext/bg/search.html       |   2 +
 ext/bg/settings.html     |   2 +
 ext/mixed/js/japanese.js |  31 +++++++
 7 files changed, 272 insertions(+), 237 deletions(-)
 create mode 100644 ext/bg/js/dictionary.js
 create mode 100644 ext/mixed/js/japanese.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index a9071cc7..3cfd894e 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -11,6 +11,8 @@
         <script src="/mixed/js/audio.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/anki-connect.js"></script>
         <script src="/bg/js/anki-null.js"></script>
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
new file mode 100644
index 00000000..6f4ec809
--- /dev/null
+++ b/ext/bg/js/dictionary.js
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function dictEnabledSet(options) {
+    const dictionaries = {};
+    for (const title in options.dictionaries) {
+        const dictionary = options.dictionaries[title];
+        if (dictionary.enabled) {
+            dictionaries[title] = dictionary;
+        }
+    }
+
+    return dictionaries;
+}
+
+function dictConfigured(options) {
+    for (const title in options.dictionaries) {
+        if (options.dictionaries[title].enabled) {
+            return true;
+        }
+    }
+
+    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) => {
+        const sl1 = v1.source.length;
+        const sl2 = v2.source.length;
+        if (sl1 > sl2) {
+            return -1;
+        } else if (sl1 < sl2) {
+            return 1;
+        }
+
+        if (dictionaries !== null) {
+            const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
+            const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
+            if (p1 > p2) {
+                return -1;
+            } else if (p1 < p2) {
+                return 1;
+            }
+        }
+
+        const s1 = v1.score;
+        const s2 = v2.score;
+        if (s1 > s2) {
+            return -1;
+        } else if (s1 < s2) {
+            return 1;
+        }
+
+        const rl1 = v1.reasons.length;
+        const rl2 = v2.reasons.length;
+        if (rl1 < rl2) {
+            return -1;
+        } else if (rl1 > rl2) {
+            return 1;
+        }
+
+        return v2.expression.localeCompare(v1.expression);
+    });
+}
+
+function dictTermsUndupe(definitions) {
+    const definitionGroups = {};
+    for (const definition of definitions) {
+        const definitionExisting = definitionGroups[definition.id];
+        if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) {
+            definitionGroups[definition.id] = definition;
+        }
+    }
+
+    const definitionsUnique = [];
+    for (const key in definitionGroups) {
+        definitionsUnique.push(definitionGroups[key]);
+    }
+
+    return definitionsUnique;
+}
+
+function dictTermsGroup(definitions, dictionaries) {
+    const groups = {};
+    for (const definition of definitions) {
+        const key = [definition.source, definition.expression].concat(definition.reasons);
+        if (definition.reading) {
+            key.push(definition.reading);
+        }
+
+        const group = groups[key];
+        if (group) {
+            group.push(definition);
+        } else {
+            groups[key] = [definition];
+        }
+    }
+
+    const results = [];
+    for (const key in groups) {
+        const groupDefs = groups[key];
+        const firstDef = groupDefs[0];
+        dictTermsSort(groupDefs, dictionaries);
+        results.push({
+            definitions: groupDefs,
+            expression: firstDef.expression,
+            reading: firstDef.reading,
+            reasons: firstDef.reasons,
+            score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
+            source: firstDef.source
+        });
+    }
+
+    return dictTermsSort(results);
+}
+
+function dictTagBuildSource(name) {
+    return dictTagSanitize({name, category: 'dictionary', order: 100});
+}
+
+function dictTagBuild(name, meta) {
+    const tag = {name};
+    const symbol = name.split(':')[0];
+    for (const prop in meta[symbol] || {}) {
+        tag[prop] = meta[symbol][prop];
+    }
+
+    return dictTagSanitize(tag);
+}
+
+function dictTagSanitize(tag) {
+    tag.name = tag.name || 'untitled';
+    tag.category = tag.category || 'default';
+    tag.notes = tag.notes || '';
+    tag.order = tag.order || 0;
+    return tag;
+}
+
+function dictTagsSort(tags) {
+    return tags.sort((v1, v2) => {
+        const order1 = v1.order;
+        const order2 = v2.order;
+        if (order1 < order2) {
+            return -1;
+        } else if (order1 > order2) {
+            return 1;
+        }
+
+        const name1 = v1.name;
+        const name2 = v2.name;
+        if (name1 < name2) {
+            return -1;
+        } else if (name1 > name2) {
+            return 1;
+        }
+
+        return 0;
+    });
+}
+
+function dictFieldSplit(field) {
+    return field.length === 0 ? [] : field.split(' ');
+}
+
+function dictFieldFormat(field, definition, mode, options) {
+    const markers = [
+        'audio',
+        'character',
+        'cloze-body',
+        'cloze-prefix',
+        'cloze-suffix',
+        'dictionary',
+        'expression',
+        'furigana',
+        'glossary',
+        'glossary-brief',
+        'kunyomi',
+        'onyomi',
+        'reading',
+        'sentence',
+        'tags',
+        'url'
+    ];
+
+    for (const marker of markers) {
+        const data = {
+            marker,
+            definition,
+            group: options.general.groupResults,
+            html: options.anki.htmlCards,
+            modeTermKanji: mode === 'term-kanji',
+            modeTermKana: mode === 'term-kana',
+            modeKanji: mode === 'kanji'
+        };
+
+        field = field.replace(
+            `{${marker}}`,
+            Handlebars.templates['fields.html'](data).trim()
+        );
+    }
+
+    return field;
+}
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 5d80fdb7..0a4592ea 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -30,24 +30,6 @@ function promiseCallback(promise, callback) {
 }
 
 
-/*
- * Japanese
- */
-
-function jpIsKanji(c) {
-    const code = c.charCodeAt(0);
-    return code >= 0x4e00 && code < 0x9fb0 || code >= 0x3400 && code < 0x4dc0;
-}
-
-function jpIsKana(c) {
-    return wanakana.isKana(c);
-}
-
-function jpKatakanaToHiragana(text) {
-    return wanakana._katakanaToHiragana(text);
-}
-
-
 /*
  * Commands
  */
@@ -91,225 +73,6 @@ function fgOptionsSet(options) {
 }
 
 
-/*
- * Dictionary
- */
-
-function dictEnabledSet(options) {
-    const dictionaries = {};
-    for (const title in options.dictionaries) {
-        const dictionary = options.dictionaries[title];
-        if (dictionary.enabled) {
-            dictionaries[title] = dictionary;
-        }
-    }
-
-    return dictionaries;
-}
-
-function dictConfigured(options) {
-    for (const title in options.dictionaries) {
-        if (options.dictionaries[title].enabled) {
-            return true;
-        }
-    }
-
-    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) => {
-        const sl1 = v1.source.length;
-        const sl2 = v2.source.length;
-        if (sl1 > sl2) {
-            return -1;
-        } else if (sl1 < sl2) {
-            return 1;
-        }
-
-        if (dictionaries !== null) {
-            const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
-            const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
-            if (p1 > p2) {
-                return -1;
-            } else if (p1 < p2) {
-                return 1;
-            }
-        }
-
-        const s1 = v1.score;
-        const s2 = v2.score;
-        if (s1 > s2) {
-            return -1;
-        } else if (s1 < s2) {
-            return 1;
-        }
-
-        const rl1 = v1.reasons.length;
-        const rl2 = v2.reasons.length;
-        if (rl1 < rl2) {
-            return -1;
-        } else if (rl1 > rl2) {
-            return 1;
-        }
-
-        return v2.expression.localeCompare(v1.expression);
-    });
-}
-
-function dictTermsUndupe(definitions) {
-    const definitionGroups = {};
-    for (const definition of definitions) {
-        const definitionExisting = definitionGroups[definition.id];
-        if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) {
-            definitionGroups[definition.id] = definition;
-        }
-    }
-
-    const definitionsUnique = [];
-    for (const key in definitionGroups) {
-        definitionsUnique.push(definitionGroups[key]);
-    }
-
-    return definitionsUnique;
-}
-
-function dictTermsGroup(definitions, dictionaries) {
-    const groups = {};
-    for (const definition of definitions) {
-        const key = [definition.source, definition.expression].concat(definition.reasons);
-        if (definition.reading) {
-            key.push(definition.reading);
-        }
-
-        const group = groups[key];
-        if (group) {
-            group.push(definition);
-        } else {
-            groups[key] = [definition];
-        }
-    }
-
-    const results = [];
-    for (const key in groups) {
-        const groupDefs = groups[key];
-        const firstDef = groupDefs[0];
-        dictTermsSort(groupDefs, dictionaries);
-        results.push({
-            definitions: groupDefs,
-            expression: firstDef.expression,
-            reading: firstDef.reading,
-            reasons: firstDef.reasons,
-            score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
-            source: firstDef.source
-        });
-    }
-
-    return dictTermsSort(results);
-}
-
-function dictTagBuildSource(name) {
-    return dictTagSanitize({name, category: 'dictionary', order: 100});
-}
-
-function dictTagBuild(name, meta) {
-    const tag = {name};
-    const symbol = name.split(':')[0];
-    for (const prop in meta[symbol] || {}) {
-        tag[prop] = meta[symbol][prop];
-    }
-
-    return dictTagSanitize(tag);
-}
-
-function dictTagSanitize(tag) {
-    tag.name = tag.name || 'untitled';
-    tag.category = tag.category || 'default';
-    tag.notes = tag.notes || '';
-    tag.order = tag.order || 0;
-    return tag;
-}
-
-function dictTagsSort(tags) {
-    return tags.sort((v1, v2) => {
-        const order1 = v1.order;
-        const order2 = v2.order;
-        if (order1 < order2) {
-            return -1;
-        } else if (order1 > order2) {
-            return 1;
-        }
-
-        const name1 = v1.name;
-        const name2 = v2.name;
-        if (name1 < name2) {
-            return -1;
-        } else if (name1 > name2) {
-            return 1;
-        }
-
-        return 0;
-    });
-}
-
-function dictFieldSplit(field) {
-    return field.length === 0 ? [] : field.split(' ');
-}
-
-function dictFieldFormat(field, definition, mode, options) {
-    const markers = [
-        'audio',
-        'character',
-        'cloze-body',
-        'cloze-prefix',
-        'cloze-suffix',
-        'dictionary',
-        'expression',
-        'furigana',
-        'glossary',
-        'glossary-brief',
-        'kunyomi',
-        'onyomi',
-        'reading',
-        'sentence',
-        'tags',
-        'url'
-    ];
-
-    for (const marker of markers) {
-        const data = {
-            marker,
-            definition,
-            group: options.general.groupResults,
-            html: options.anki.htmlCards,
-            modeTermKanji: mode === 'term-kanji',
-            modeTermKana: mode === 'term-kana',
-            modeKanji: mode === 'kanji'
-        };
-
-        field = field.replace(
-            `{${marker}}`,
-            Handlebars.templates['fields.html'](data).trim()
-        );
-    }
-
-    return field;
-}
-
 /*
  * JSON
  */
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index ab2ee1e0..db9097bd 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -31,6 +31,8 @@
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/popup.js"></script>
     </body>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 0fc3caf7..b30b8910 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -34,6 +34,8 @@
 
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/lib/wanakana.min.js"></script>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index ada3299b..8135ca9a 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -277,6 +277,8 @@
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/settings.js"></script>
     </body>
diff --git a/ext/mixed/js/japanese.js b/ext/mixed/js/japanese.js
new file mode 100644
index 00000000..779e3d35
--- /dev/null
+++ b/ext/mixed/js/japanese.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function jpIsKanji(c) {
+    const code = c.charCodeAt(0);
+    return code >= 0x4e00 && code < 0x9fb0 || code >= 0x3400 && code < 0x4dc0;
+}
+
+function jpIsKana(c) {
+    return wanakana.isKana(c);
+}
+
+function jpKatakanaToHiragana(text) {
+    return wanakana._katakanaToHiragana(text);
+}
-- 
cgit v1.2.3


From 62db3d74b8042dd3185a7a552920a2ce7a4bd4ab Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 19 Jul 2017 09:24:38 -0700
Subject: factor out handlebars from util

---
 ext/bg/background.html  |  1 +
 ext/bg/js/handlebars.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/util.js       | 41 ------------------------------------
 ext/bg/settings.html    |  1 +
 4 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 ext/bg/js/handlebars.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 3cfd894e..61bc17a0 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -11,6 +11,7 @@
         <script src="/mixed/js/audio.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
new file mode 100644
index 00000000..42b36927
--- /dev/null
+++ b/ext/bg/js/handlebars.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function handlebarsEscape(text) {
+    return Handlebars.Utils.escapeExpression(text);
+}
+
+function handlebarsDumpObject(options) {
+    const dump = JSON.stringify(options.fn(this), null, 4);
+    return handlebarsEscape(dump);
+}
+
+function handlebarsKanjiLinks(options) {
+    let result = '';
+    for (const c of options.fn(this)) {
+        if (jpIsKanji(c)) {
+            result += `<a href="#" class="kanji-link">${c}</a>`;
+        } else {
+            result += c;
+        }
+    }
+
+    return result;
+}
+
+function handlebarsMultiLine(options) {
+    return options.fn(this).split('\n').join('<br>');
+}
+
+function handlebarsRegister() {
+    Handlebars.partials = Handlebars.templates;
+    Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
+    Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
+    Handlebars.registerHelper('multiLine', handlebarsMultiLine);
+}
+
+function handlebarsRender(template, data) {
+    return Handlebars.templates[template](data);
+}
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 0a4592ea..6e86c2a6 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -98,44 +98,3 @@ function jsonRequest(url, action, params) {
         }
     });
 }
-
-/*
- * Helpers
- */
-
-function handlebarsEscape(text) {
-    return Handlebars.Utils.escapeExpression(text);
-}
-
-function handlebarsDumpObject(options) {
-    const dump = JSON.stringify(options.fn(this), null, 4);
-    return handlebarsEscape(dump);
-}
-
-function handlebarsKanjiLinks(options) {
-    let result = '';
-    for (const c of options.fn(this)) {
-        if (jpIsKanji(c)) {
-            result += `<a href="#" class="kanji-link">${c}</a>`;
-        } else {
-            result += c;
-        }
-    }
-
-    return result;
-}
-
-function handlebarsMultiLine(options) {
-    return options.fn(this).split('\n').join('<br>');
-}
-
-function handlebarsRegister() {
-    Handlebars.partials = Handlebars.templates;
-    Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
-    Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
-    Handlebars.registerHelper('multiLine', handlebarsMultiLine);
-}
-
-function handlebarsRender(template, data) {
-    return Handlebars.templates[template](data);
-}
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 8135ca9a..9b21b4d8 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -277,6 +277,7 @@
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
-- 
cgit v1.2.3


From fe137e94c92cf0366735936b6ac82dc147b1ad33 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 19 Jul 2017 21:28:09 -0700
Subject: cleanup

---
 ext/bg/background.html    |  1 +
 ext/bg/js/anki-connect.js |  2 +-
 ext/bg/js/translator.js   |  2 +-
 ext/bg/js/util.js         | 40 ----------------------------------------
 ext/bg/js/yomichan.js     |  8 ++++++++
 ext/bg/popup.html         |  1 +
 ext/bg/search.html        |  1 +
 ext/bg/settings.html      |  1 +
 ext/mixed/js/request.js   | 40 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 54 insertions(+), 42 deletions(-)
 create mode 100644 ext/mixed/js/request.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 61bc17a0..7d352561 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -14,6 +14,7 @@
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
+        <script src="/mixed/js/request.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/anki-connect.js"></script>
         <script src="/bg/js/anki-null.js"></script>
diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
index a4d8ba3f..567e8d3f 100644
--- a/ext/bg/js/anki-connect.js
+++ b/ext/bg/js/anki-connect.js
@@ -64,6 +64,6 @@ class AnkiConnect {
     }
 
     ankiInvoke(action, params) {
-        return jsonRequest(this.server, 'POST', {action, params, version: this.localVersion});
+        return requestJson(this.server, 'POST', {action, params, version: this.localVersion});
     }
 }
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 9232e529..1be485c7 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -31,7 +31,7 @@ class Translator {
 
         if (!this.deinflector) {
             const url = chrome.extension.getURL('/bg/lang/deinflect.json');
-            const reasons = await jsonRequest(url, 'GET');
+            const reasons = await requestJson(url, 'GET');
             this.deinflector = new Deinflector(reasons);
         }
     }
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 6e86c2a6..c7ebbb0e 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -17,19 +17,6 @@
  */
 
 
-/*
- * Promise
- */
-
-function promiseCallback(promise, callback) {
-    return promise.then(result => {
-        callback({result});
-    }).catch(error => {
-        callback({error});
-    });
-}
-
-
 /*
  * Commands
  */
@@ -71,30 +58,3 @@ function fgBroadcast(action, params) {
 function fgOptionsSet(options) {
     fgBroadcast('optionsSet', options);
 }
-
-
-/*
- * JSON
- */
-
-function jsonRequest(url, action, params) {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.overrideMimeType('application/json');
-        xhr.addEventListener('load', () => resolve(xhr.responseText));
-        xhr.addEventListener('error', () => reject('failed to execute network request'));
-        xhr.open(action, url);
-        if (params) {
-            xhr.send(JSON.stringify(params));
-        } else {
-            xhr.send();
-        }
-    }).then(responseText => {
-        try {
-            return JSON.parse(responseText);
-        }
-        catch (e) {
-            return Promise.reject('invalid JSON response');
-        }
-    });
-}
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
index acc560ce..eb083396 100644
--- a/ext/bg/js/yomichan.js
+++ b/ext/bg/js/yomichan.js
@@ -195,6 +195,14 @@ window.yomichan = new class {
     }
 
     onMessage({action, params}, sender, callback) {
+        const promiseCallback = (promise, callback) => {
+            return promise.then(result => {
+                callback({result});
+            }).catch(error => {
+                callback({error});
+            });
+        };
+
         const handlers = {
             optionsGet: ({callback}) => {
                 promiseCallback(optionsLoad(), callback);
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index db9097bd..b3d38533 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -32,6 +32,7 @@
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/util.js"></script>
         <script src="/bg/js/dictionary.js"></script>
+        <script src="/mixed/js/request.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/popup.js"></script>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index b30b8910..45603f17 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -35,6 +35,7 @@
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/bg/js/util.js"></script>
         <script src="/bg/js/dictionary.js"></script>
+        <script src="/mixed/js/request.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 9b21b4d8..4c7198c3 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -280,6 +280,7 @@
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
+        <script src="/mixed/js/request.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/settings.js"></script>
     </body>
diff --git a/ext/mixed/js/request.js b/ext/mixed/js/request.js
new file mode 100644
index 00000000..94fd135a
--- /dev/null
+++ b/ext/mixed/js/request.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017  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/>.
+ */
+
+
+function requestJson(url, action, params) {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.overrideMimeType('application/json');
+        xhr.addEventListener('load', () => resolve(xhr.responseText));
+        xhr.addEventListener('error', () => reject('failed to execute network request'));
+        xhr.open(action, url);
+        if (params) {
+            xhr.send(JSON.stringify(params));
+        } else {
+            xhr.send();
+        }
+    }).then(responseText => {
+        try {
+            return JSON.parse(responseText);
+        }
+        catch (e) {
+            return Promise.reject('invalid JSON response');
+        }
+    });
+}
-- 
cgit v1.2.3


From ac2e079c98f87acfbafd2105461885a1cb199c76 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 19 Jul 2017 21:41:30 -0700
Subject: cleanup

---
 ext/bg/background.html |  2 +-
 ext/bg/js/instance.js  | 30 +++++++++++++++++++++++++
 ext/bg/js/options.js   |  1 -
 ext/bg/js/popup.js     |  2 ++
 ext/bg/js/util.js      | 60 --------------------------------------------------
 ext/bg/js/yomichan.js  |  6 +++++
 ext/bg/popup.html      |  2 +-
 ext/bg/search.html     |  2 +-
 ext/bg/settings.html   |  2 +-
 9 files changed, 42 insertions(+), 65 deletions(-)
 create mode 100644 ext/bg/js/instance.js
 delete mode 100644 ext/bg/js/util.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 7d352561..de3cbf20 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -10,7 +10,7 @@
         <script src="/mixed/lib/jszip.min.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
diff --git a/ext/bg/js/instance.js b/ext/bg/js/instance.js
new file mode 100644
index 00000000..0df267cc
--- /dev/null
+++ b/ext/bg/js/instance.js
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function instYomi() {
+    return chrome.extension.getBackgroundPage().yomichan;
+}
+
+function instDb() {
+    return instYomi().translator.database;
+}
+
+function instAnki() {
+    return instYomi().anki;
+}
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index a9345fdd..d611ae59 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -127,6 +127,5 @@ function optionsSave(options) {
         chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
     }).then(() => {
         instYomi().optionsSet(options);
-        fgOptionsSet(options);
     });
 }
diff --git a/ext/bg/js/popup.js b/ext/bg/js/popup.js
index 8577dd96..01994827 100644
--- a/ext/bg/js/popup.js
+++ b/ext/bg/js/popup.js
@@ -18,6 +18,8 @@
 
 
 $(document).ready(() => {
+    const commandExec = command => instYomi().onCommand(command);
+
     $('#open-search').click(() => commandExec('search'));
     $('#open-options').click(() => commandExec('options'));
     $('#open-help').click(() => commandExec('help'));
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
deleted file mode 100644
index c7ebbb0e..00000000
--- a/ext/bg/js/util.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016  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/>.
- */
-
-
-/*
- * Commands
- */
-
-function commandExec(command) {
-    instYomi().onCommand(command);
-}
-
-
-/*
- * Instance
- */
-
-function instYomi() {
-    return chrome.extension.getBackgroundPage().yomichan;
-}
-
-function instDb() {
-    return instYomi().translator.database;
-}
-
-function instAnki() {
-    return instYomi().anki;
-}
-
-
-/*
- * Foreground
- */
-
-function fgBroadcast(action, params) {
-    chrome.tabs.query({}, tabs => {
-        for (const tab of tabs) {
-            chrome.tabs.sendMessage(tab.id, {action, params}, () => null);
-        }
-    });
-}
-
-function fgOptionsSet(options) {
-    fgBroadcast('optionsSet', options);
-}
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
index eb083396..214bdef3 100644
--- a/ext/bg/js/yomichan.js
+++ b/ext/bg/js/yomichan.js
@@ -59,6 +59,12 @@ window.yomichan = new class {
         } else {
             this.anki = new AnkiNull();
         }
+
+        chrome.tabs.query({}, tabs => {
+            for (const tab of tabs) {
+                chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
+            }
+        });
     }
 
     noteFormat(definition, mode) {
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index b3d38533..baeb2ffb 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -30,7 +30,7 @@
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
-        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/request.js"></script>
         <script src="/mixed/js/japanese.js"></script>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 45603f17..472907c2 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -33,7 +33,7 @@
         </div>
 
         <script src="/mixed/lib/jquery.min.js"></script>
-        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/request.js"></script>
         <script src="/mixed/js/japanese.js"></script>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 4c7198c3..9c3995eb 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -276,7 +276,7 @@
         <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
-- 
cgit v1.2.3


From a0e2d9cb721d44a89715f3a9df10135c2aebfe29 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 20 Jul 2017 21:32:17 -0700
Subject: cleanup

---
 ext/bg/background.html |   2 +-
 ext/bg/js/backend.js   | 250 +++++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/instance.js  |   2 +-
 ext/bg/js/yomichan.js  | 250 -------------------------------------------------
 ext/fg/js/frontend.js  |   2 +-
 5 files changed, 253 insertions(+), 253 deletions(-)
 create mode 100644 ext/bg/js/backend.js
 delete mode 100644 ext/bg/js/yomichan.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index de3cbf20..27d9bc41 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -21,6 +21,6 @@
         <script src="/bg/js/database.js"></script>
         <script src="/bg/js/deinflector.js"></script>
         <script src="/bg/js/translator.js"></script>
-        <script src="/bg/js/yomichan.js"></script>
+        <script src="/bg/js/backend.js"></script>
     </body>
 </html>
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
new file mode 100644
index 00000000..f5415d93
--- /dev/null
+++ b/ext/bg/js/backend.js
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+window.yomichanBackend = new class {
+    constructor() {
+        handlebarsRegister();
+
+        this.translator = new Translator();
+        this.anki = new AnkiNull();
+        this.options = null;
+
+        this.translator.prepare().then(optionsLoad).then(options => {
+            this.optionsSet(options);
+
+            chrome.commands.onCommand.addListener(this.onCommand.bind(this));
+            chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
+
+            if (this.options.general.showGuide) {
+                chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
+            }
+        });
+    }
+
+    optionsSet(options) {
+        // In Firefox, setting options from the options UI somehow carries references
+        // to the DOM across to the background page, causing the options object to
+        // become a "DeadObject" after the options page is closed. The workaround used
+        // here is to create a deep copy of the options object.
+        this.options = JSON.parse(JSON.stringify(options));
+
+        if (!this.options.general.enable) {
+            chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
+            chrome.browserAction.setBadgeText({text: 'off'});
+        } else if (!dictConfigured(this.options)) {
+            chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
+            chrome.browserAction.setBadgeText({text: '!'});
+        } else {
+            chrome.browserAction.setBadgeText({text: ''});
+        }
+
+        if (this.options.anki.enable) {
+            this.anki = new AnkiConnect(this.options.anki.server);
+        } else {
+            this.anki = new AnkiNull();
+        }
+
+        chrome.tabs.query({}, tabs => {
+            for (const tab of tabs) {
+                chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
+            }
+        });
+    }
+
+    noteFormat(definition, mode) {
+        const note = {
+            fields: {},
+            tags: this.options.anki.tags
+        };
+
+        let fields = [];
+        if (mode === 'kanji') {
+            fields = this.options.anki.kanji.fields;
+            note.deckName = this.options.anki.kanji.deck;
+            note.modelName = this.options.anki.kanji.model;
+        } else {
+            fields = this.options.anki.terms.fields;
+            note.deckName = this.options.anki.terms.deck;
+            note.modelName = this.options.anki.terms.model;
+
+            if (definition.audio) {
+                const audio = {
+                    url: definition.audio.url,
+                    filename: definition.audio.filename,
+                    skipHash: '7e2c2f954ef6051373ba916f000168dc',
+                    fields: []
+                };
+
+                for (const name in fields) {
+                    if (fields[name].includes('{audio}')) {
+                        audio.fields.push(name);
+                    }
+                }
+
+                if (audio.fields.length > 0) {
+                    note.audio = audio;
+                }
+            }
+        }
+
+        for (const name in fields) {
+            note.fields[name] = dictFieldFormat(
+                fields[name],
+                definition,
+                mode,
+                this.options
+            );
+        }
+
+        return note;
+    }
+
+    termsFind(text) {
+        const searcher = this.options.general.groupResults ?
+            this.translator.findTermsGrouped.bind(this.translator) :
+            this.translator.findTerms.bind(this.translator);
+
+        return searcher(text, dictEnabledSet(this.options), this.options.scanning.alphanumeric).then(({definitions, length}) => {
+            return {length, definitions: definitions.slice(0, this.options.general.maxResults)};
+        });
+    }
+
+    kanjiFind(text) {
+        return this.translator.findKanji(text, dictEnabledSet(this.options)).then(definitions => {
+            return definitions.slice(0, this.options.general.maxResults);
+        });
+    }
+
+    definitionAdd(definition, mode) {
+        let promise = Promise.resolve();
+        if (mode !== 'kanji') {
+            promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
+        }
+
+        return promise.then(() => {
+            const note = this.noteFormat(definition, mode);
+            return this.anki.addNote(note);
+        });
+    }
+
+    definitionsAddable(definitions, modes) {
+        const notes = [];
+        for (const definition of definitions) {
+            for (const mode of modes) {
+                notes.push(this.noteFormat(definition, mode));
+            }
+        }
+
+        return this.anki.canAddNotes(notes).then(raw => {
+            const states = [];
+            for (let resultBase = 0; resultBase < raw.length; resultBase += modes.length) {
+                const state = {};
+                for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
+                    state[modes[modeOffset]] = raw[resultBase + modeOffset];
+                }
+
+                states.push(state);
+            }
+
+            return states;
+        });
+    }
+
+    noteView(noteId) {
+        return this.anki.guiBrowse(`nid:${noteId}`);
+    }
+
+    templateRender(template, data) {
+        return Promise.resolve(handlebarsRender(template, data));
+    }
+
+    onCommand(command) {
+        const handlers = {
+            search: () => {
+                chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
+            },
+
+            help: () => {
+                chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
+            },
+
+            options: () => {
+                chrome.runtime.openOptionsPage();
+            },
+
+            toggle: () => {
+                this.options.general.enable = !this.options.general.enable;
+                optionsSave(this.options).then(() => this.optionsSet(this.options));
+            }
+        };
+
+        const handler = handlers[command];
+        if (handler) {
+            handler();
+        }
+    }
+
+    onMessage({action, params}, sender, callback) {
+        const promiseCallback = (promise, callback) => {
+            return promise.then(result => {
+                callback({result});
+            }).catch(error => {
+                callback({error});
+            });
+        };
+
+        const handlers = {
+            optionsGet: ({callback}) => {
+                promiseCallback(optionsLoad(), callback);
+            },
+
+            kanjiFind: ({text, callback}) => {
+                promiseCallback(this.kanjiFind(text), callback);
+            },
+
+            termsFind: ({text, callback}) => {
+                promiseCallback(this.termsFind(text), callback);
+            },
+
+            templateRender: ({template, data, callback}) => {
+                promiseCallback(this.templateRender(template, data), callback);
+            },
+
+            definitionAdd: ({definition, mode, callback}) => {
+                promiseCallback(this.definitionAdd(definition, mode), callback);
+            },
+
+            definitionsAddable: ({definitions, modes, callback}) => {
+                promiseCallback(this.definitionsAddable(definitions, modes), callback);
+            },
+
+            noteView: ({noteId}) => {
+                promiseCallback(this.noteView(noteId), callback);
+            }
+        };
+
+        const handler = handlers[action];
+        if (handler) {
+            params.callback = callback;
+            handler(params);
+        }
+
+        return true;
+    }
+};
diff --git a/ext/bg/js/instance.js b/ext/bg/js/instance.js
index 0df267cc..bf858fbf 100644
--- a/ext/bg/js/instance.js
+++ b/ext/bg/js/instance.js
@@ -18,7 +18,7 @@
 
 
 function instYomi() {
-    return chrome.extension.getBackgroundPage().yomichan;
+    return chrome.extension.getBackgroundPage().yomichanBackend;
 }
 
 function instDb() {
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
deleted file mode 100644
index 214bdef3..00000000
--- a/ext/bg/js/yomichan.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2016  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/>.
- */
-
-
-window.yomichan = new class {
-    constructor() {
-        handlebarsRegister();
-
-        this.translator = new Translator();
-        this.anki = new AnkiNull();
-        this.options = null;
-
-        this.translator.prepare().then(optionsLoad).then(options => {
-            this.optionsSet(options);
-
-            chrome.commands.onCommand.addListener(this.onCommand.bind(this));
-            chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
-
-            if (this.options.general.showGuide) {
-                chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
-            }
-        });
-    }
-
-    optionsSet(options) {
-        // In Firefox, setting options from the options UI somehow carries references
-        // to the DOM across to the background page, causing the options object to
-        // become a "DeadObject" after the options page is closed. The workaround used
-        // here is to create a deep copy of the options object.
-        this.options = JSON.parse(JSON.stringify(options));
-
-        if (!this.options.general.enable) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
-            chrome.browserAction.setBadgeText({text: 'off'});
-        } else if (!dictConfigured(this.options)) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
-            chrome.browserAction.setBadgeText({text: '!'});
-        } else {
-            chrome.browserAction.setBadgeText({text: ''});
-        }
-
-        if (this.options.anki.enable) {
-            this.anki = new AnkiConnect(this.options.anki.server);
-        } else {
-            this.anki = new AnkiNull();
-        }
-
-        chrome.tabs.query({}, tabs => {
-            for (const tab of tabs) {
-                chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
-            }
-        });
-    }
-
-    noteFormat(definition, mode) {
-        const note = {
-            fields: {},
-            tags: this.options.anki.tags
-        };
-
-        let fields = [];
-        if (mode === 'kanji') {
-            fields = this.options.anki.kanji.fields;
-            note.deckName = this.options.anki.kanji.deck;
-            note.modelName = this.options.anki.kanji.model;
-        } else {
-            fields = this.options.anki.terms.fields;
-            note.deckName = this.options.anki.terms.deck;
-            note.modelName = this.options.anki.terms.model;
-
-            if (definition.audio) {
-                const audio = {
-                    url: definition.audio.url,
-                    filename: definition.audio.filename,
-                    skipHash: '7e2c2f954ef6051373ba916f000168dc',
-                    fields: []
-                };
-
-                for (const name in fields) {
-                    if (fields[name].includes('{audio}')) {
-                        audio.fields.push(name);
-                    }
-                }
-
-                if (audio.fields.length > 0) {
-                    note.audio = audio;
-                }
-            }
-        }
-
-        for (const name in fields) {
-            note.fields[name] = dictFieldFormat(
-                fields[name],
-                definition,
-                mode,
-                this.options
-            );
-        }
-
-        return note;
-    }
-
-    termsFind(text) {
-        const searcher = this.options.general.groupResults ?
-            this.translator.findTermsGrouped.bind(this.translator) :
-            this.translator.findTerms.bind(this.translator);
-
-        return searcher(text, dictEnabledSet(this.options), this.options.scanning.alphanumeric).then(({definitions, length}) => {
-            return {length, definitions: definitions.slice(0, this.options.general.maxResults)};
-        });
-    }
-
-    kanjiFind(text) {
-        return this.translator.findKanji(text, dictEnabledSet(this.options)).then(definitions => {
-            return definitions.slice(0, this.options.general.maxResults);
-        });
-    }
-
-    definitionAdd(definition, mode) {
-        let promise = Promise.resolve();
-        if (mode !== 'kanji') {
-            promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
-        }
-
-        return promise.then(() => {
-            const note = this.noteFormat(definition, mode);
-            return this.anki.addNote(note);
-        });
-    }
-
-    definitionsAddable(definitions, modes) {
-        const notes = [];
-        for (const definition of definitions) {
-            for (const mode of modes) {
-                notes.push(this.noteFormat(definition, mode));
-            }
-        }
-
-        return this.anki.canAddNotes(notes).then(raw => {
-            const states = [];
-            for (let resultBase = 0; resultBase < raw.length; resultBase += modes.length) {
-                const state = {};
-                for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
-                    state[modes[modeOffset]] = raw[resultBase + modeOffset];
-                }
-
-                states.push(state);
-            }
-
-            return states;
-        });
-    }
-
-    noteView(noteId) {
-        return this.anki.guiBrowse(`nid:${noteId}`);
-    }
-
-    templateRender(template, data) {
-        return Promise.resolve(handlebarsRender(template, data));
-    }
-
-    onCommand(command) {
-        const handlers = {
-            search: () => {
-                chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
-            },
-
-            help: () => {
-                chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
-            },
-
-            options: () => {
-                chrome.runtime.openOptionsPage();
-            },
-
-            toggle: () => {
-                this.options.general.enable = !this.options.general.enable;
-                optionsSave(this.options).then(() => this.optionsSet(this.options));
-            }
-        };
-
-        const handler = handlers[command];
-        if (handler) {
-            handler();
-        }
-    }
-
-    onMessage({action, params}, sender, callback) {
-        const promiseCallback = (promise, callback) => {
-            return promise.then(result => {
-                callback({result});
-            }).catch(error => {
-                callback({error});
-            });
-        };
-
-        const handlers = {
-            optionsGet: ({callback}) => {
-                promiseCallback(optionsLoad(), callback);
-            },
-
-            kanjiFind: ({text, callback}) => {
-                promiseCallback(this.kanjiFind(text), callback);
-            },
-
-            termsFind: ({text, callback}) => {
-                promiseCallback(this.termsFind(text), callback);
-            },
-
-            templateRender: ({template, data, callback}) => {
-                promiseCallback(this.templateRender(template, data), callback);
-            },
-
-            definitionAdd: ({definition, mode, callback}) => {
-                promiseCallback(this.definitionAdd(definition, mode), callback);
-            },
-
-            definitionsAddable: ({definitions, modes, callback}) => {
-                promiseCallback(this.definitionsAddable(definitions, modes), callback);
-            },
-
-            noteView: ({noteId}) => {
-                promiseCallback(this.noteView(noteId), callback);
-            }
-        };
-
-        const handler = handlers[action];
-        if (handler) {
-            params.callback = callback;
-            handler(params);
-        }
-
-        return true;
-    }
-};
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 5a51af6d..e32a630d 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -17,7 +17,7 @@
  */
 
 
-window.frontend = new class {
+window.yomichanFrontend = new class {
     constructor() {
         this.popup = new Popup();
         this.popupTimer = null;
-- 
cgit v1.2.3


From 32680c58b895e4c781cfb2f51a97fbff42e111b0 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 23 Jul 2017 22:48:33 -0700
Subject: cleanup

---
 ext/bg/background.html      |  22 +++--
 ext/bg/js/api.js            | 236 ++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/backend.js        | 223 ++---------------------------------------
 ext/bg/js/display-window.js |  20 ----
 ext/bg/js/instance.js       |  30 ------
 ext/bg/js/options.js        |   2 +-
 ext/bg/popup.html           |   1 -
 ext/bg/search.html          |   1 -
 ext/bg/settings.html        |   1 -
 ext/mixed/js/display.js     |  34 ++-----
 10 files changed, 265 insertions(+), 305 deletions(-)
 create mode 100644 ext/bg/js/api.js
 delete mode 100644 ext/bg/js/instance.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 27d9bc41..1e9f3809 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -4,23 +4,25 @@
         <meta charset="UTF-8">
     </head>
     <body>
-        <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/mixed/lib/dexie.min.js"></script>
-        <script src="/mixed/lib/wanakana.min.js"></script>
+        <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/mixed/lib/jszip.min.js"></script>
-        <script src="/mixed/js/audio.js"></script>
-        <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/instance.js"></script>
-        <script src="/bg/js/handlebars.js"></script>
-        <script src="/bg/js/dictionary.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
-        <script src="/mixed/js/request.js"></script>
-        <script src="/bg/js/options.js"></script>
+        <script src="/mixed/lib/wanakana.min.js"></script>
+
         <script src="/bg/js/anki-connect.js"></script>
         <script src="/bg/js/anki-null.js"></script>
+        <script src="/bg/js/api.js"></script>
         <script src="/bg/js/database.js"></script>
         <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/options.js"></script>
+        <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/translator.js"></script>
+        <script src="/mixed/js/audio.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
+        <script src="/mixed/js/request.js"></script>
+
         <script src="/bg/js/backend.js"></script>
     </body>
 </html>
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
new file mode 100644
index 00000000..3db0558b
--- /dev/null
+++ b/ext/bg/js/api.js
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function utilMessageDispatch({action, params}, sender, callback) {
+    const forward = (promise, callback) => {
+        return promise.then(result => {
+            callback({result});
+        }).catch(error => {
+            callback({error});
+        });
+    };
+
+    const handlers = {
+        optionsGet: ({callback}) => {
+            forward(optionsLoad(), callback);
+        },
+
+        kanjiFind: ({text, callback}) => {
+            forward(apiKanjiFind(text), callback);
+        },
+
+        termsFind: ({text, callback}) => {
+            forward(apiTermsFind(text), callback);
+        },
+
+        templateRender: ({template, data, callback}) => {
+            forward(apiTemplateRender(template, data), callback);
+        },
+
+        definitionAdd: ({definition, mode, callback}) => {
+            forward(apiDefinitionAdd(definition, mode), callback);
+        },
+
+        definitionsAddable: ({definitions, modes, callback}) => {
+            forward(apiDefinitionsAddable(definitions, modes), callback);
+        },
+
+        noteView: ({noteId}) => {
+            forward(apiNoteView(noteId), callback);
+        }
+    };
+
+    const handler = handlers[action];
+    if (handler) {
+        params.callback = callback;
+        handler(params);
+    }
+
+    return true;
+}
+
+function utilCommandDispatch(command) {
+    const handlers = {
+        search: () => {
+            chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
+        },
+
+        help: () => {
+            chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
+        },
+
+        options: () => {
+            chrome.runtime.openOptionsPage();
+        },
+
+        toggle: () => {
+            this.options.general.enable = !this.options.general.enable;
+            optionsSave(this.options).then(() => this.optionsSet(this.options));
+        }
+    };
+
+    const handler = handlers[command];
+    if (handler) {
+        handler();
+    }
+}
+
+function utilNoteFormat(definition, mode) {
+    const options = Backend.instance().options;
+    const note = {fields: {}, tags: options.anki.tags};
+    let fields = [];
+
+    if (mode === 'kanji') {
+        fields = options.anki.kanji.fields;
+        note.deckName = options.anki.kanji.deck;
+        note.modelName = options.anki.kanji.model;
+    } else {
+        fields = options.anki.terms.fields;
+        note.deckName = options.anki.terms.deck;
+        note.modelName = options.anki.terms.model;
+
+        if (definition.audio) {
+            const audio = {
+                url: definition.audio.url,
+                filename: definition.audio.filename,
+                skipHash: '7e2c2f954ef6051373ba916f000168dc',
+                fields: []
+            };
+
+            for (const name in fields) {
+                if (fields[name].includes('{audio}')) {
+                    audio.fields.push(name);
+                }
+            }
+
+            if (audio.fields.length > 0) {
+                note.audio = audio;
+            }
+        }
+    }
+
+    for (const name in fields) {
+        note.fields[name] = dictFieldFormat(fields[name], definition, mode, options);
+    }
+
+    return note;
+}
+
+async function apiOptionsSet(options) {
+    // In Firefox, setting options from the options UI somehow carries references
+    // to the DOM across to the background page, causing the options object to
+    // become a "DeadObject" after the options page is closed. The workaround used
+    // here is to create a deep copy of the options object.
+    Backend.instance().options = JSON.parse(JSON.stringify(options));
+
+    if (!options.general.enable) {
+        chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
+        chrome.browserAction.setBadgeText({text: 'off'});
+    } else if (!dictConfigured(options)) {
+        chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
+        chrome.browserAction.setBadgeText({text: '!'});
+    } else {
+        chrome.browserAction.setBadgeText({text: ''});
+    }
+
+    if (options.anki.enable) {
+        Backend.instance().anki = new AnkiConnect(options.anki.server);
+    } else {
+        Backend.instance().anki = new AnkiNull();
+    }
+
+    chrome.tabs.query({}, tabs => {
+        for (const tab of tabs) {
+            chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
+        }
+    });
+}
+
+async function apiOptionsGet() {
+    return Backend.instance().options;
+}
+
+async function apiTermsFind(text) {
+    const options = Backend.instance().options;
+    const translator = Backend.instance().translator;
+
+    const searcher = options.general.groupResults ?
+        translator.findTermsGrouped.bind(translator) :
+        translator.findTerms.bind(translator);
+
+    const {definitions, length} = await searcher(
+        text,
+        dictEnabledSet(options),
+        options.scanning.alphanumeric
+    );
+
+    return {
+        length,
+        definitions: definitions.slice(0, options.general.maxResults)
+    };
+}
+
+async function apiKanjiFind(text) {
+    const options = Backend.instance().options;
+    const definitions = await Backend.instance().translator.findKanji(text, dictEnabledSet(options));
+    return definitions.slice(0, options.general.maxResults);
+}
+
+async function apiDefinitionAdd(definition, mode) {
+    if (mode !== 'kanji') {
+        const options = Backend.instance().options;
+        await audioInject(
+            definition,
+            options.anki.terms.fields,
+            options.general.audioSource
+        );
+    }
+
+    return Backend.instance().anki.addNote(utilNoteFormat(definition, mode));
+}
+
+async function apiDefinitionsAddable(definitions, modes) {
+    const notes = [];
+    for (const definition of definitions) {
+        for (const mode of modes) {
+            notes.push(utilNoteFormat(definition, mode));
+        }
+    }
+
+    const results = await Backend.instance().anki.canAddNotes(notes);
+    const states = [];
+    for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
+        const state = {};
+        for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
+            state[modes[modeOffset]] = results[resultBase + modeOffset];
+        }
+
+        states.push(state);
+    }
+
+    return states;
+}
+
+async function apiNoteView(noteId) {
+    return Backend.instance().anki.guiBrowse(`nid:${noteId}`);
+}
+
+async function apiTemplateRender(template, data) {
+    return handlebarsRender(template, data);
+}
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index f5415d93..e977735e 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -17,7 +17,7 @@
  */
 
 
-window.yomichanBackend = new class {
+class Backend {
     constructor() {
         handlebarsRegister();
 
@@ -26,225 +26,20 @@ window.yomichanBackend = new class {
         this.options = null;
 
         this.translator.prepare().then(optionsLoad).then(options => {
-            this.optionsSet(options);
+            apiOptionsSet(options);
 
-            chrome.commands.onCommand.addListener(this.onCommand.bind(this));
-            chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
+            chrome.commands.onCommand.addListener(utilCommandDispatch);
+            chrome.runtime.onMessage.addListener(utilMessageDispatch);
 
-            if (this.options.general.showGuide) {
+            if (options.general.showGuide) {
                 chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
             }
         });
     }
 
-    optionsSet(options) {
-        // In Firefox, setting options from the options UI somehow carries references
-        // to the DOM across to the background page, causing the options object to
-        // become a "DeadObject" after the options page is closed. The workaround used
-        // here is to create a deep copy of the options object.
-        this.options = JSON.parse(JSON.stringify(options));
-
-        if (!this.options.general.enable) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
-            chrome.browserAction.setBadgeText({text: 'off'});
-        } else if (!dictConfigured(this.options)) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
-            chrome.browserAction.setBadgeText({text: '!'});
-        } else {
-            chrome.browserAction.setBadgeText({text: ''});
-        }
-
-        if (this.options.anki.enable) {
-            this.anki = new AnkiConnect(this.options.anki.server);
-        } else {
-            this.anki = new AnkiNull();
-        }
-
-        chrome.tabs.query({}, tabs => {
-            for (const tab of tabs) {
-                chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
-            }
-        });
-    }
-
-    noteFormat(definition, mode) {
-        const note = {
-            fields: {},
-            tags: this.options.anki.tags
-        };
-
-        let fields = [];
-        if (mode === 'kanji') {
-            fields = this.options.anki.kanji.fields;
-            note.deckName = this.options.anki.kanji.deck;
-            note.modelName = this.options.anki.kanji.model;
-        } else {
-            fields = this.options.anki.terms.fields;
-            note.deckName = this.options.anki.terms.deck;
-            note.modelName = this.options.anki.terms.model;
-
-            if (definition.audio) {
-                const audio = {
-                    url: definition.audio.url,
-                    filename: definition.audio.filename,
-                    skipHash: '7e2c2f954ef6051373ba916f000168dc',
-                    fields: []
-                };
-
-                for (const name in fields) {
-                    if (fields[name].includes('{audio}')) {
-                        audio.fields.push(name);
-                    }
-                }
-
-                if (audio.fields.length > 0) {
-                    note.audio = audio;
-                }
-            }
-        }
-
-        for (const name in fields) {
-            note.fields[name] = dictFieldFormat(
-                fields[name],
-                definition,
-                mode,
-                this.options
-            );
-        }
-
-        return note;
-    }
-
-    termsFind(text) {
-        const searcher = this.options.general.groupResults ?
-            this.translator.findTermsGrouped.bind(this.translator) :
-            this.translator.findTerms.bind(this.translator);
-
-        return searcher(text, dictEnabledSet(this.options), this.options.scanning.alphanumeric).then(({definitions, length}) => {
-            return {length, definitions: definitions.slice(0, this.options.general.maxResults)};
-        });
-    }
-
-    kanjiFind(text) {
-        return this.translator.findKanji(text, dictEnabledSet(this.options)).then(definitions => {
-            return definitions.slice(0, this.options.general.maxResults);
-        });
-    }
-
-    definitionAdd(definition, mode) {
-        let promise = Promise.resolve();
-        if (mode !== 'kanji') {
-            promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
-        }
-
-        return promise.then(() => {
-            const note = this.noteFormat(definition, mode);
-            return this.anki.addNote(note);
-        });
-    }
-
-    definitionsAddable(definitions, modes) {
-        const notes = [];
-        for (const definition of definitions) {
-            for (const mode of modes) {
-                notes.push(this.noteFormat(definition, mode));
-            }
-        }
-
-        return this.anki.canAddNotes(notes).then(raw => {
-            const states = [];
-            for (let resultBase = 0; resultBase < raw.length; resultBase += modes.length) {
-                const state = {};
-                for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
-                    state[modes[modeOffset]] = raw[resultBase + modeOffset];
-                }
-
-                states.push(state);
-            }
-
-            return states;
-        });
-    }
-
-    noteView(noteId) {
-        return this.anki.guiBrowse(`nid:${noteId}`);
-    }
-
-    templateRender(template, data) {
-        return Promise.resolve(handlebarsRender(template, data));
-    }
-
-    onCommand(command) {
-        const handlers = {
-            search: () => {
-                chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
-            },
-
-            help: () => {
-                chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
-            },
-
-            options: () => {
-                chrome.runtime.openOptionsPage();
-            },
-
-            toggle: () => {
-                this.options.general.enable = !this.options.general.enable;
-                optionsSave(this.options).then(() => this.optionsSet(this.options));
-            }
-        };
-
-        const handler = handlers[command];
-        if (handler) {
-            handler();
-        }
-    }
-
-    onMessage({action, params}, sender, callback) {
-        const promiseCallback = (promise, callback) => {
-            return promise.then(result => {
-                callback({result});
-            }).catch(error => {
-                callback({error});
-            });
-        };
-
-        const handlers = {
-            optionsGet: ({callback}) => {
-                promiseCallback(optionsLoad(), callback);
-            },
-
-            kanjiFind: ({text, callback}) => {
-                promiseCallback(this.kanjiFind(text), callback);
-            },
-
-            termsFind: ({text, callback}) => {
-                promiseCallback(this.termsFind(text), callback);
-            },
-
-            templateRender: ({template, data, callback}) => {
-                promiseCallback(this.templateRender(template, data), callback);
-            },
-
-            definitionAdd: ({definition, mode, callback}) => {
-                promiseCallback(this.definitionAdd(definition, mode), callback);
-            },
-
-            definitionsAddable: ({definitions, modes, callback}) => {
-                promiseCallback(this.definitionsAddable(definitions, modes), callback);
-            },
-
-            noteView: ({noteId}) => {
-                promiseCallback(this.noteView(noteId), callback);
-            }
-        };
-
-        const handler = handlers[action];
-        if (handler) {
-            params.callback = callback;
-            handler(params);
-        }
-
-        return true;
+    static instance() {
+        return chrome.extension.getBackgroundPage().yomichanBackend;
     }
 };
+
+window.yomichanBackend = new Backend();
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
index 64e56f72..e5357bf9 100644
--- a/ext/bg/js/display-window.js
+++ b/ext/bg/js/display-window.js
@@ -29,26 +29,6 @@ window.displayWindow = new class extends Display {
         window.wanakana.bind(query.get(0));
     }
 
-    definitionAdd(definition, mode) {
-        return instYomi().definitionAdd(definition, mode);
-    }
-
-    definitionsAddable(definitions, modes) {
-        return instYomi().definitionsAddable(definitions, modes).catch(() => []);
-    }
-
-    noteView(noteId) {
-        return instYomi().noteView(noteId);
-    }
-
-    templateRender(template, data) {
-        return instYomi().templateRender(template, data);
-    }
-
-    kanjiFind(character) {
-        return instYomi().kanjiFind(character);
-    }
-
     handleError(error) {
         window.alert(`Error: ${error}`);
     }
diff --git a/ext/bg/js/instance.js b/ext/bg/js/instance.js
deleted file mode 100644
index bf858fbf..00000000
--- a/ext/bg/js/instance.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2016  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/>.
- */
-
-
-function instYomi() {
-    return chrome.extension.getBackgroundPage().yomichanBackend;
-}
-
-function instDb() {
-    return instYomi().translator.database;
-}
-
-function instAnki() {
-    return instYomi().anki;
-}
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index d611ae59..ea52d337 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -126,6 +126,6 @@ function optionsSave(options) {
     return new Promise((resolve, reject) => {
         chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
     }).then(() => {
-        instYomi().optionsSet(options);
+        apiOptionsSet(options);
     });
 }
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index baeb2ffb..26c0f0bb 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -30,7 +30,6 @@
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
-        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/request.js"></script>
         <script src="/mixed/js/japanese.js"></script>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 472907c2..7cbae392 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -33,7 +33,6 @@
         </div>
 
         <script src="/mixed/lib/jquery.min.js"></script>
-        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/request.js"></script>
         <script src="/mixed/js/japanese.js"></script>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 9c3995eb..2d0b4b4c 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -276,7 +276,6 @@
         <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/instance.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/mixed/js/japanese.js"></script>
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index e54bc0f9..f408fb25 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -32,26 +32,6 @@ class Display {
         $(document).keydown(this.onKeyDown.bind(this));
     }
 
-    definitionAdd(definition, mode) {
-        throw 'override me';
-    }
-
-    definitionsAddable(definitions, modes) {
-        throw 'override me';
-    }
-
-    noteView(noteId) {
-        throw 'override me';
-    }
-
-    templateRender(template, data) {
-        throw 'override me';
-    }
-
-    kanjiFind(character) {
-        throw 'override me';
-    }
-
     handleError(error) {
         throw 'override me';
     }
@@ -87,7 +67,7 @@ class Display {
             }
         }
 
-        this.templateRender('terms.html', params).then(content => {
+        apiTemplateRender('terms.html', params).then(content => {
             this.container.html(content);
             this.entryScroll(context && context.index || 0);
 
@@ -126,7 +106,7 @@ class Display {
             }
         }
 
-        this.templateRender('kanji.html', params).then(content => {
+        apiTemplateRender('kanji.html', params).then(content => {
             this.container.html(content);
             this.entryScroll(context && context.index || 0);
 
@@ -138,7 +118,7 @@ class Display {
     }
 
     adderButtonsUpdate(modes, sequence) {
-        return this.definitionsAddable(this.definitions, modes).then(states => {
+        return apiDefinitionsAddable(this.definitions, modes).then(states => {
             if (!states || sequence !== this.sequence) {
                 return;
             }
@@ -198,7 +178,7 @@ class Display {
             context.url = this.context.url;
         }
 
-        this.kanjiFind(link.text()).then(kanjiDefs => {
+        apiKanjiFind(link.text()).then(kanjiDefs => {
             this.showKanjiDefs(kanjiDefs, this.options, context);
         }).catch(this.handleError.bind(this));
     }
@@ -220,7 +200,7 @@ class Display {
         e.preventDefault();
         const link = $(e.currentTarget);
         const index = Display.entryIndexFind(link);
-        this.noteView(link.data('noteId'));
+        apiNoteView(link.data('noteId'));
     }
 
     onKeyDown(e) {
@@ -234,7 +214,7 @@ class Display {
         const noteTryView = mode => {
             const button = Display.viewerButtonFind(this.index);
             if (button.length !== 0 && !button.hasClass('disabled')) {
-                this.noteView(button.data('noteId'));
+                apiNoteView(button.data('noteId'));
             }
         };
 
@@ -351,7 +331,7 @@ class Display {
 
     noteAdd(definition, mode) {
         this.spinner.show();
-        return this.definitionAdd(definition, mode).then(noteId => {
+        return apiDefinitionAdd(definition, mode).then(noteId => {
             if (noteId) {
                 const index = this.definitions.indexOf(definition);
                 Display.adderButtonFind(index, mode).addClass('disabled');
-- 
cgit v1.2.3


From eed630e9fa3c62610bda356e9c76393e70c1a08c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 24 Jul 2017 22:44:19 -0700
Subject: cleanup

---
 ext/bg/js/backend.js |  2 +-
 ext/bg/js/popup.js   | 10 ++++------
 ext/bg/popup.html    |  7 +++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index e977735e..0615ffae 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -40,6 +40,6 @@ class Backend {
     static instance() {
         return chrome.extension.getBackgroundPage().yomichanBackend;
     }
-};
+}
 
 window.yomichanBackend = new Backend();
diff --git a/ext/bg/js/popup.js b/ext/bg/js/popup.js
index 01994827..712839d9 100644
--- a/ext/bg/js/popup.js
+++ b/ext/bg/js/popup.js
@@ -18,16 +18,14 @@
 
 
 $(document).ready(() => {
-    const commandExec = command => instYomi().onCommand(command);
-
-    $('#open-search').click(() => commandExec('search'));
-    $('#open-options').click(() => commandExec('options'));
-    $('#open-help').click(() => commandExec('help'));
+    $('#open-search').click(() => utilCommandDispatch('search'));
+    $('#open-options').click(() => utilCommandDispatch('options'));
+    $('#open-help').click(() => utilCommandDispatch('help'));
 
     optionsLoad().then(options => {
         const toggle = $('#enable-search');
         toggle.prop('checked', options.general.enable).change();
         toggle.bootstrapToggle();
-        toggle.change(() => commandExec('toggle'));
+        toggle.change(() => utilCommandDispatch('toggle'));
     });
 });
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index 26c0f0bb..4113b008 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -27,13 +27,16 @@
                 <button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
             </div>
         </p>
+
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
+
+        <script src="/bg/js/api.js"></script>
         <script src="/bg/js/dictionary.js"></script>
-        <script src="/mixed/js/request.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/popup.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
+        <script src="/mixed/js/request.js"></script>
     </body>
 </html>
-- 
cgit v1.2.3


From adbc7a32cc0cb050b29443e0719e36dd8fafde58 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 27 Jul 2017 21:42:14 -0700
Subject: cleanup

---
 ext/bg/js/api.js      | 35 ++++++++++++++++++++++-------------
 ext/bg/js/backend.js  | 10 ++--------
 ext/bg/js/settings.js | 47 +++++++++++++++++++++++++++++++++++++++++------
 ext/bg/settings.html  |  9 ++++++---
 4 files changed, 71 insertions(+), 30 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 3db0558b..6d6ec2ea 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -92,7 +92,8 @@ function utilCommandDispatch(command) {
 }
 
 function utilNoteFormat(definition, mode) {
-    const options = Backend.instance().options;
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const options = yomichan.options;
     const note = {fields: {}, tags: options.anki.tags};
     let fields = [];
 
@@ -137,7 +138,8 @@ async function apiOptionsSet(options) {
     // to the DOM across to the background page, causing the options object to
     // become a "DeadObject" after the options page is closed. The workaround used
     // here is to create a deep copy of the options object.
-    Backend.instance().options = JSON.parse(JSON.stringify(options));
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    yomichan.options = JSON.parse(JSON.stringify(options));
 
     if (!options.general.enable) {
         chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
@@ -150,9 +152,9 @@ async function apiOptionsSet(options) {
     }
 
     if (options.anki.enable) {
-        Backend.instance().anki = new AnkiConnect(options.anki.server);
+        yomichan.anki = new AnkiConnect(options.anki.server);
     } else {
-        Backend.instance().anki = new AnkiNull();
+        yomichan.anki = new AnkiNull();
     }
 
     chrome.tabs.query({}, tabs => {
@@ -163,12 +165,14 @@ async function apiOptionsSet(options) {
 }
 
 async function apiOptionsGet() {
-    return Backend.instance().options;
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.options;
 }
 
 async function apiTermsFind(text) {
-    const options = Backend.instance().options;
-    const translator = Backend.instance().translator;
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const options = yomichan.options;
+    const translator = yomichan.translator;
 
     const searcher = options.general.groupResults ?
         translator.findTermsGrouped.bind(translator) :
@@ -187,14 +191,17 @@ async function apiTermsFind(text) {
 }
 
 async function apiKanjiFind(text) {
-    const options = Backend.instance().options;
-    const definitions = await Backend.instance().translator.findKanji(text, dictEnabledSet(options));
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const options = yomichan.options;
+    const definitions = await yomichan.translator.findKanji(text, dictEnabledSet(options));
     return definitions.slice(0, options.general.maxResults);
 }
 
 async function apiDefinitionAdd(definition, mode) {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+
     if (mode !== 'kanji') {
-        const options = Backend.instance().options;
+        const options = yomichan.options;
         await audioInject(
             definition,
             options.anki.terms.fields,
@@ -202,7 +209,7 @@ async function apiDefinitionAdd(definition, mode) {
         );
     }
 
-    return Backend.instance().anki.addNote(utilNoteFormat(definition, mode));
+    return yomichan.anki.addNote(utilNoteFormat(definition, mode));
 }
 
 async function apiDefinitionsAddable(definitions, modes) {
@@ -213,7 +220,8 @@ async function apiDefinitionsAddable(definitions, modes) {
         }
     }
 
-    const results = await Backend.instance().anki.canAddNotes(notes);
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const results = await yomichan.anki.canAddNotes(notes);
     const states = [];
     for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
         const state = {};
@@ -228,7 +236,8 @@ async function apiDefinitionsAddable(definitions, modes) {
 }
 
 async function apiNoteView(noteId) {
-    return Backend.instance().anki.guiBrowse(`nid:${noteId}`);
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.anki.guiBrowse(`nid:${noteId}`);
 }
 
 async function apiTemplateRender(template, data) {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 0615ffae..4fabe4b2 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -17,7 +17,7 @@
  */
 
 
-class Backend {
+window.yomichanBackend = new class {
     constructor() {
         handlebarsRegister();
 
@@ -36,10 +36,4 @@ class Backend {
             }
         });
     }
-
-    static instance() {
-        return chrome.extension.getBackgroundPage().yomichanBackend;
-    }
-}
-
-window.yomichanBackend = new Backend();
+};
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 3cd64fbd..09e92249 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -17,6 +17,41 @@
  */
 
 
+/*
+ * Utilities
+ */
+
+function utilAnkiGetModelNames() {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.anki.getModelNames();
+}
+
+function utilAnkiGetDeckNames() {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.anki.getDeckNames();
+}
+
+function utilAnkiGetModelFieldNames(modelName) {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.anki.utilAnkiGetModelFieldNames(modelName);
+}
+
+function utilDatabaseGetDictionaries() {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.translator.database.getDictionaries();
+}
+
+function utilDatabasePurge() {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.translator.database.purge();
+}
+
+function utilDatabaseImport(data, progress) {
+    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    return yomichan.translator.database.importDictionary(data, progress);
+}
+
+
 /*
  * General
  */
@@ -217,7 +252,7 @@ async function dictionaryGroupsPopulate(options) {
     const dictGroups = $('#dict-groups').empty();
     const dictWarning = $('#dict-warning').hide();
 
-    const dictRows = await instDb().getDictionaries();
+    const dictRows = await utilDatabaseGetDictionaries();
     if (dictRows.length === 0) {
         dictWarning.show();
     }
@@ -253,7 +288,7 @@ async function onDictionaryPurge(e) {(async () => {
         dictionaryErrorShow();
         dictionarySpinnerShow(true);
 
-        await instDb().purge();
+        await utilDatabasePurge();
         const options = await optionsLoad();
         options.dictionaries = {};
         await optionsSave(options);
@@ -283,7 +318,7 @@ function onDictionaryImport(e) {(async () => {
         setProgress(0.0);
 
         const options = await optionsLoad();
-        const summary = await instDb().importDictionary(e.target.files[0], updateProgress);
+        const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
         options.dictionaries[summary.title] = {enabled: true, priority: 0};
         await optionsSave(options);
 
@@ -344,12 +379,12 @@ async function ankiDeckAndModelPopulate(options) {
     $('#anki-terms-deck').val(options.anki.terms.deck);
     $('#anki-kanji-deck').val(options.anki.kanji.deck);
 
-    const deckNames = await instAnki().getDeckNames();
+    const deckNames = await utilAnkiGetDeckNames();
     const ankiDeck = $('.anki-deck');
     ankiDeck.find('option').remove();
     deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
 
-    const modelNames = await instAnki().getModelNames();
+    const modelNames = await utilAnkiGetModelNames();
     const ankiModel = $('.anki-model');
     ankiModel.find('option').remove();
     modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
@@ -398,7 +433,7 @@ async function ankiFieldsPopulate(element, options) {
         ]
     }[tabId] || {};
 
-    for (const name of await instAnki().getModelFieldNames(modelName)) {
+    for (const name of await utilAnkiGetModelFieldNames(modelName)) {
         const value = options.anki[tabId].fields[name] || '';
         const html = Handlebars.templates['model.html']({name, markers, value});
         container.append($(html));
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 2d0b4b4c..03a9870b 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -275,12 +275,15 @@
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
-        <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/handlebars.js"></script>
+
+        <script src="/bg/js/api.js"></script>
         <script src="/bg/js/dictionary.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/options.js"></script>
+        <script src="/bg/js/templates.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/request.js"></script>
-        <script src="/bg/js/options.js"></script>
+
         <script src="/bg/js/settings.js"></script>
     </body>
 </html>
-- 
cgit v1.2.3


From 9ecc7c17f3800c891b6681fd4b8738898ae6d4b6 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 27 Jul 2017 21:45:18 -0700
Subject: cleanup

---
 ext/bg/js/settings.js | 2 +-
 ext/bg/settings.html  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 09e92249..f024ee35 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -33,7 +33,7 @@ function utilAnkiGetDeckNames() {
 
 function utilAnkiGetModelFieldNames(modelName) {
     const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
-    return yomichan.anki.utilAnkiGetModelFieldNames(modelName);
+    return yomichan.anki.getModelFieldNames(modelName);
 }
 
 function utilDatabaseGetDictionaries() {
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 03a9870b..7833a21d 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -276,6 +276,8 @@
         <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
 
+        <script src="/bg/js/anki-connect.js"></script>
+        <script src="/bg/js/anki-null.js"></script>
         <script src="/bg/js/api.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
-- 
cgit v1.2.3


From ba155e77063bd86fb5751656d8d5d462a129214f Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 27 Jul 2017 23:26:36 -0700
Subject: cleanup

---
 ext/bg/js/api.js      | 25 +++++++++++++++++--------
 ext/bg/js/backend.js  |  2 +-
 ext/bg/js/settings.js | 12 ++++++------
 3 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 6d6ec2ea..11267918 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -17,6 +17,10 @@
  */
 
 
+/*
+ * Helpers
+ */
+
 function utilMessageDispatch({action, params}, sender, callback) {
     const forward = (promise, callback) => {
         return promise.then(result => {
@@ -92,7 +96,7 @@ function utilCommandDispatch(command) {
 }
 
 function utilNoteFormat(definition, mode) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     const options = yomichan.options;
     const note = {fields: {}, tags: options.anki.tags};
     let fields = [];
@@ -133,12 +137,17 @@ function utilNoteFormat(definition, mode) {
     return note;
 }
 
+
+/*
+ * API
+ */
+
 async function apiOptionsSet(options) {
     // In Firefox, setting options from the options UI somehow carries references
     // to the DOM across to the background page, causing the options object to
     // become a "DeadObject" after the options page is closed. The workaround used
     // here is to create a deep copy of the options object.
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     yomichan.options = JSON.parse(JSON.stringify(options));
 
     if (!options.general.enable) {
@@ -165,12 +174,12 @@ async function apiOptionsSet(options) {
 }
 
 async function apiOptionsGet() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.options;
 }
 
 async function apiTermsFind(text) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     const options = yomichan.options;
     const translator = yomichan.translator;
 
@@ -191,14 +200,14 @@ async function apiTermsFind(text) {
 }
 
 async function apiKanjiFind(text) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     const options = yomichan.options;
     const definitions = await yomichan.translator.findKanji(text, dictEnabledSet(options));
     return definitions.slice(0, options.general.maxResults);
 }
 
 async function apiDefinitionAdd(definition, mode) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
 
     if (mode !== 'kanji') {
         const options = yomichan.options;
@@ -220,7 +229,7 @@ async function apiDefinitionsAddable(definitions, modes) {
         }
     }
 
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     const results = await yomichan.anki.canAddNotes(notes);
     const states = [];
     for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
@@ -236,7 +245,7 @@ async function apiDefinitionsAddable(definitions, modes) {
 }
 
 async function apiNoteView(noteId) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.anki.guiBrowse(`nid:${noteId}`);
 }
 
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 4fabe4b2..2763a141 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -17,7 +17,7 @@
  */
 
 
-window.yomichanBackend = new class {
+window.yomichan = new class {
     constructor() {
         handlebarsRegister();
 
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index f024ee35..a0406e0c 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -22,32 +22,32 @@
  */
 
 function utilAnkiGetModelNames() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.anki.getModelNames();
 }
 
 function utilAnkiGetDeckNames() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.anki.getDeckNames();
 }
 
 function utilAnkiGetModelFieldNames(modelName) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.anki.getModelFieldNames(modelName);
 }
 
 function utilDatabaseGetDictionaries() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.translator.database.getDictionaries();
 }
 
 function utilDatabasePurge() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.translator.database.purge();
 }
 
 function utilDatabaseImport(data, progress) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichanBackend;
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     return yomichan.translator.database.importDictionary(data, progress);
 }
 
-- 
cgit v1.2.3


From fea35435b22a4eeadbfcc5f29d5f9518700d4306 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 29 Jul 2017 08:55:29 -0700
Subject: cleanup

---
 ext/bg/js/anki-connect.js |  2 +-
 ext/bg/js/api.js          | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
index 567e8d3f..80c075fd 100644
--- a/ext/bg/js/anki-connect.js
+++ b/ext/bg/js/anki-connect.js
@@ -58,7 +58,7 @@ class AnkiConnect {
         if (this.remoteVersion < this.localVersion) {
             this.remoteVersion = await this.ankiInvoke('version');
             if (this.remoteVersion < this.localVersion) {
-                return Promise.reject('extension and plugin versions incompatible');
+                throw 'extension and plugin versions incompatible';
             }
         }
     }
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 11267918..ac53a7a3 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -84,8 +84,9 @@ function utilCommandDispatch(command) {
         },
 
         toggle: () => {
-            this.options.general.enable = !this.options.general.enable;
-            optionsSave(this.options).then(() => this.optionsSet(this.options));
+            const options = chrome.extension.getBackgroundPage().yomichan.options;
+            options.general.enable = !options.general.enable;
+            optionsSave(options).then(() => apiOptionsSet(options));
         }
     };
 
@@ -96,8 +97,7 @@ function utilCommandDispatch(command) {
 }
 
 function utilNoteFormat(definition, mode) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    const options = yomichan.options;
+    const options = chrome.extension.getBackgroundPage().yomichan.options;
     const note = {fields: {}, tags: options.anki.tags};
     let fields = [];
 
@@ -174,8 +174,7 @@ async function apiOptionsSet(options) {
 }
 
 async function apiOptionsGet() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.options;
+    return chrome.extension.getBackgroundPage().yomichan.options;
 }
 
 async function apiTermsFind(text) {
-- 
cgit v1.2.3


From b061cc914210e6c11bc419c38ec850b59d72dd4d Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 29 Jul 2017 09:55:54 -0700
Subject: cleanup

---
 ext/bg/js/backend.js        |   2 -
 ext/bg/js/dictionary.js     |   2 +-
 ext/bg/js/display-window.js |  14 +++--
 ext/bg/js/handlebars.js     |  14 ++---
 ext/bg/js/settings.js       |   2 -
 ext/bg/js/templates.js      | 136 ++++++++++++++++++++++----------------------
 ext/bg/search.html          |  12 +++-
 ext/fg/frame.html           |   9 +--
 8 files changed, 99 insertions(+), 92 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 2763a141..f7823047 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -19,8 +19,6 @@
 
 window.yomichan = new class {
     constructor() {
-        handlebarsRegister();
-
         this.translator = new Translator();
         this.anki = new AnkiNull();
         this.options = null;
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 6f4ec809..73efe7d1 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -225,7 +225,7 @@ function dictFieldFormat(field, definition, mode, options) {
 
         field = field.replace(
             `{${marker}}`,
-            Handlebars.templates['fields.html'](data).trim()
+            handlebarsRender('fields.html', data)
         );
     }
 
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
index e5357bf9..1f607510 100644
--- a/ext/bg/js/display-window.js
+++ b/ext/bg/js/display-window.js
@@ -37,11 +37,15 @@ window.displayWindow = new class extends Display {
         $('#query').focus().select();
     }
 
-    onSearch(e) {
+    async onSearch(e) {
         e.preventDefault();
-        $('#intro').slideUp();
-        instYomi().termsFind($('#query').val()).then(({length, definitions}) => {
-            super.showTermDefs(definitions, instYomi().options);
-        }).catch(this.handleError.bind(this));
+
+        try {
+            $('#intro').slideUp();
+            const {length, definitions} = await apiTermsFind($('#query').val());
+            super.showTermDefs(definitions, await apiOptionsGet());
+        } catch (e) {
+            this.handleError(e);
+        }
     }
 };
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
index 42b36927..df98bef1 100644
--- a/ext/bg/js/handlebars.js
+++ b/ext/bg/js/handlebars.js
@@ -43,13 +43,13 @@ function handlebarsMultiLine(options) {
     return options.fn(this).split('\n').join('<br>');
 }
 
-function handlebarsRegister() {
-    Handlebars.partials = Handlebars.templates;
-    Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
-    Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
-    Handlebars.registerHelper('multiLine', handlebarsMultiLine);
-}
-
 function handlebarsRender(template, data) {
+    if (Handlebars.partials !== Handlebars.templates) {
+        Handlebars.partials = Handlebars.templates;
+        Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
+        Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
+        Handlebars.registerHelper('multiLine', handlebarsMultiLine);
+    }
+
     return Handlebars.templates[template](data);
 }
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index a0406e0c..fa44c8da 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -158,8 +158,6 @@ async function onFormOptionsChanged(e) {(async () => {
 })();}
 
 function onReady() {(async () => {
-    handlebarsRegister();
-
     const options = await optionsLoad();
 
     $('#show-usage-guide').prop('checked', options.general.showGuide);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 6fa1dad0..7e05015a 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -3,7 +3,7 @@
 templates['dictionary.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     return "checked";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<div class=\"dict-group well well-sm\" data-title=\""
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
@@ -24,24 +24,24 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 templates['fields.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(15, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(15, data, 0),"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
 },"3":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"4":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<i>("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ")</i> ";
 },"5":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {};
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
@@ -51,12 +51,12 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     var stack1;
 
   return "<ul>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ul>";
 },"9":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "<li>";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</li>";
@@ -65,7 +65,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"12":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = "";
 
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer;
@@ -74,29 +74,29 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
 },"15":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(19, data, 0),"inverse":container.program(13, data, 0),"data":data})) != null ? stack1 : "");
 },"16":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"17":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ") ";
 },"19":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"20":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(depth0, depth0))
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"22":function(container,depth0,helpers,partials,data) {
     return "";
 },"24":function(container,depth0,helpers,partials,data) {
@@ -110,11 +110,11 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"28":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(29, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(29, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
 },"29":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(30, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(30, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
 },"30":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -126,11 +126,11 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"34":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0),"inverse":container.program(38, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0),"inverse":container.program(38, data, 0),"data":data})) != null ? stack1 : "");
 },"35":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(36, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(36, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
 },"36":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
@@ -142,7 +142,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"38":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(39, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(39, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
 },"39":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
@@ -151,7 +151,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
     + "]";
 },"41":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0, blockParams, depths),"inverse":container.program(53, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
@@ -161,16 +161,16 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"44":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(45, data, 0),"inverse":container.program(51, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(45, data, 0),"inverse":container.program(51, data, 0),"data":data})) != null ? stack1 : "");
 },"45":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(46, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(46, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
 },"46":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<ol>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(47, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(47, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ol>";
 },"47":function(container,depth0,helpers,partials,data) {
     return "<li>"
@@ -179,7 +179,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"49":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"51":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -187,20 +187,20 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(64, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(64, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(56, data, 0, blockParams, depths),"inverse":container.program(59, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(56, data, 0, blockParams, depths),"inverse":container.program(59, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"56":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "<ol>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(57, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(57, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ol>";
 },"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
@@ -211,7 +211,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"59":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
@@ -234,19 +234,19 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"70":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"72":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"74":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(30, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(30, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"76":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(77, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(77, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"77":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -254,7 +254,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"79":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(80, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(80, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"80":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -262,7 +262,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"82":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(83, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(83, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"83":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -270,7 +270,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"85":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(86, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(86, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"86":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -278,11 +278,11 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 },"88":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"90":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(91, data, 0),"inverse":container.program(93, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(91, data, 0),"inverse":container.program(93, data, 0),"data":data})) != null ? stack1 : "");
 },"91":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
@@ -299,7 +299,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     var stack1;
 
   return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
-    + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : {},depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+    + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
@@ -326,7 +326,7 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
 
 ,"useDecorators":true,"usePartial":true,"useData":true,"useDepths":true});
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {};
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return "<div class=\"entry\" data-type=\"kanji\">\n    <div class=\"actions\">\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -353,12 +353,12 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 
   return "                    "
     + container.escapeExpression(container.lambda(depth0, depth0))
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n";
 },"7":function(container,depth0,helpers,partials,data) {
     return ", ";
 },"9":function(container,depth0,helpers,partials,data) {
-    var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "        <span class=\"label label-default tag-"
     + alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
@@ -371,12 +371,12 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "        <ol>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </ol>\n";
 },"12":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "            <li><span class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</span></li>\n";
@@ -385,7 +385,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"15":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "        <div class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
@@ -396,7 +396,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"18":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <pre>";
-  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(19, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(19, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.dumpObject) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</pre>\n";
@@ -407,11 +407,11 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"21":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"22":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = container.invokePartial(partials.kanji,depth0,{"name":"kanji","hash":{"root":(depths[1] != null ? depths[1].root : depths[1]),"source":(depths[1] != null ? depths[1].source : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"23":function(container,depth0,helpers,partials,data) {
@@ -422,7 +422,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "\n"
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(21, data, 0, blockParams, depths),"inverse":container.program(25, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(21, data, 0, blockParams, depths),"inverse":container.program(25, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
@@ -437,7 +437,7 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</a></li>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<tr>\n    <td class=\"col-sm-2\">"
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
@@ -450,7 +450,7 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
     + "                </ul>\n            </div>\n        </div>\n    </td>\n</tr>\n";
 },"useData":true});
 templates['terms.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "");
@@ -458,10 +458,10 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "<div>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"3":function(container,depth0,helpers,partials,data) {
-    var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "    <span class=\"label label-default tag-"
     + alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
@@ -474,12 +474,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "<ul>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ul>\n";
 },"6":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <li><span class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</span></li>\n";
@@ -488,7 +488,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"9":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "<div class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
@@ -497,7 +497,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
 },"12":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return "<div class=\"entry\" data-type=\"term\">\n    <div class=\"actions\">\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -516,7 +516,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"15":function(container,depth0,helpers,partials,data) {
     return "        <a href=\"#\" class=\"action-play-audio\"><img src=\"/mixed/img/play-audio.png\" title=\"Play audio (Alt + P)\" alt></a>\n";
 },"17":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = 
+    var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", buffer = 
   "    <div class=\"expression\"><ruby>";
   stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
@@ -527,11 +527,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"18":function(container,depth0,helpers,partials,data) {
     var helper;
 
-  return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper)));
+  return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"expression","hash":{},"data":data}) : helper)));
 },"20":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <div class=\"expression\">";
-  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
@@ -539,7 +539,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "    <div class=\"reasons\">\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n";
 },"23":function(container,depth0,helpers,partials,data) {
     var stack1;
@@ -547,19 +547,19 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
   return "        <span class=\"reasons\">"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span> "
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(24, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(24, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n";
 },"24":function(container,depth0,helpers,partials,data) {
     return "&laquo;";
 },"26":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
 },"27":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "        <ol>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </ol>\n";
 },"28":function(container,depth0,helpers,partials,data) {
     var stack1;
@@ -578,7 +578,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"34":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <pre>";
-  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(35, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(35, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.dumpObject) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</pre>\n";
@@ -589,11 +589,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"37":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"38":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"grouped":(depths[1] != null ? depths[1].grouped : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"39":function(container,depth0,helpers,partials,data) {
@@ -604,7 +604,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "\n\n"
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(37, data, 0, blockParams, depths),"inverse":container.program(41, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(37, data, 0, blockParams, depths),"inverse":container.program(41, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 7cbae392..655d7819 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -32,13 +32,19 @@
             <div id="content"></div>
         </div>
 
+        <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/mixed/lib/jquery.min.js"></script>
+        <script src="/mixed/lib/wanakana.min.js"></script>
+
+        <script src="/bg/js/api.js"></script>
         <script src="/bg/js/dictionary.js"></script>
-        <script src="/mixed/js/request.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/templates.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
-        <script src="/mixed/lib/wanakana.min.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
+        <script src="/mixed/js/request.js"></script>
+
         <script src="/bg/js/display-window.js"></script>
     </body>
 </html>
diff --git a/ext/fg/frame.html b/ext/fg/frame.html
index 9ff2c585..e0b9eac5 100644
--- a/ext/fg/frame.html
+++ b/ext/fg/frame.html
@@ -30,12 +30,13 @@
             </div>
         </div>
 
-        <script src="/mixed/lib/jquery.min.js"></script>
-        <script src="/mixed/lib/wanakana.min.js"></script>
+        <script src="/fg/js/api.js"></script>
+        <script src="/fg/js/dictionary.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
-        <script src="/fg/js/dictionary.js"></script>
-        <script src="/fg/js/api.js"></script>
+        <script src="/mixed/lib/jquery.min.js"></script>
+        <script src="/mixed/lib/wanakana.min.js"></script>
+
         <script src="/fg/js/display-frame.js"></script>
     </body>
 </html>
-- 
cgit v1.2.3


From b2003a0a560a9bd469e23e860c39dc5b21412021 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Aug 2017 13:13:06 -0700
Subject: cleanup

---
 ext/bg/js/api.js     | 102 ++++++++++++++-------------------------------------
 ext/bg/js/backend.js |  50 ++++++++++++++++++++++++-
 ext/bg/js/popup.js   |   8 ++--
 3 files changed, 79 insertions(+), 81 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index ac53a7a3..103d247c 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -21,81 +21,6 @@
  * Helpers
  */
 
-function utilMessageDispatch({action, params}, sender, callback) {
-    const forward = (promise, callback) => {
-        return promise.then(result => {
-            callback({result});
-        }).catch(error => {
-            callback({error});
-        });
-    };
-
-    const handlers = {
-        optionsGet: ({callback}) => {
-            forward(optionsLoad(), callback);
-        },
-
-        kanjiFind: ({text, callback}) => {
-            forward(apiKanjiFind(text), callback);
-        },
-
-        termsFind: ({text, callback}) => {
-            forward(apiTermsFind(text), callback);
-        },
-
-        templateRender: ({template, data, callback}) => {
-            forward(apiTemplateRender(template, data), callback);
-        },
-
-        definitionAdd: ({definition, mode, callback}) => {
-            forward(apiDefinitionAdd(definition, mode), callback);
-        },
-
-        definitionsAddable: ({definitions, modes, callback}) => {
-            forward(apiDefinitionsAddable(definitions, modes), callback);
-        },
-
-        noteView: ({noteId}) => {
-            forward(apiNoteView(noteId), callback);
-        }
-    };
-
-    const handler = handlers[action];
-    if (handler) {
-        params.callback = callback;
-        handler(params);
-    }
-
-    return true;
-}
-
-function utilCommandDispatch(command) {
-    const handlers = {
-        search: () => {
-            chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
-        },
-
-        help: () => {
-            chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
-        },
-
-        options: () => {
-            chrome.runtime.openOptionsPage();
-        },
-
-        toggle: () => {
-            const options = chrome.extension.getBackgroundPage().yomichan.options;
-            options.general.enable = !options.general.enable;
-            optionsSave(options).then(() => apiOptionsSet(options));
-        }
-    };
-
-    const handler = handlers[command];
-    if (handler) {
-        handler();
-    }
-}
-
 function utilNoteFormat(definition, mode) {
     const options = chrome.extension.getBackgroundPage().yomichan.options;
     const note = {fields: {}, tags: options.anki.tags};
@@ -142,6 +67,33 @@ function utilNoteFormat(definition, mode) {
  * API
  */
 
+async function apiCommandExec(command) {
+    const handlers = {
+        search: () => {
+            chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
+        },
+
+        help: () => {
+            chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
+        },
+
+        options: () => {
+            chrome.runtime.openOptionsPage();
+        },
+
+        toggle: () => {
+            const options = chrome.extension.getBackgroundPage().yomichan.options;
+            options.general.enable = !options.general.enable;
+            optionsSave(options).then(() => apiOptionsSet(options));
+        }
+    };
+
+    const handler = handlers[command];
+    if (handler) {
+        handler();
+    }
+}
+
 async function apiOptionsSet(options) {
     // In Firefox, setting options from the options UI somehow carries references
     // to the DOM across to the background page, causing the options object to
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index f7823047..2f60b4b7 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -26,8 +26,54 @@ window.yomichan = new class {
         this.translator.prepare().then(optionsLoad).then(options => {
             apiOptionsSet(options);
 
-            chrome.commands.onCommand.addListener(utilCommandDispatch);
-            chrome.runtime.onMessage.addListener(utilMessageDispatch);
+            chrome.commands.onCommand.addListener(apiCommandExec);
+            chrome.runtime.onMessage.addListener(({action, params}, sender, callback) => {
+                const forward = (promise, callback) => {
+                    return promise.then(result => {
+                        callback({result});
+                    }).catch(error => {
+                        callback({error});
+                    });
+                };
+
+                const handlers = {
+                    optionsGet: ({callback}) => {
+                        forward(optionsLoad(), callback);
+                    },
+
+                    kanjiFind: ({text, callback}) => {
+                        forward(apiKanjiFind(text), callback);
+                    },
+
+                    termsFind: ({text, callback}) => {
+                        forward(apiTermsFind(text), callback);
+                    },
+
+                    templateRender: ({template, data, callback}) => {
+                        forward(apiTemplateRender(template, data), callback);
+                    },
+
+                    definitionAdd: ({definition, mode, callback}) => {
+                        forward(apiDefinitionAdd(definition, mode), callback);
+                    },
+
+                    definitionsAddable: ({definitions, modes, callback}) => {
+                        forward(apiDefinitionsAddable(definitions, modes), callback);
+                    },
+
+                    noteView: ({noteId}) => {
+                        forward(apiNoteView(noteId), callback);
+                    }
+                };
+
+                const handler = handlers[action];
+                if (handler) {
+                    params.callback = callback;
+                    handler(params);
+                }
+
+                return true;
+            });
 
             if (options.general.showGuide) {
                 chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
diff --git a/ext/bg/js/popup.js b/ext/bg/js/popup.js
index 712839d9..77cb5166 100644
--- a/ext/bg/js/popup.js
+++ b/ext/bg/js/popup.js
@@ -18,14 +18,14 @@
 
 
 $(document).ready(() => {
-    $('#open-search').click(() => utilCommandDispatch('search'));
-    $('#open-options').click(() => utilCommandDispatch('options'));
-    $('#open-help').click(() => utilCommandDispatch('help'));
+    $('#open-search').click(() => apiCommandExec('search'));
+    $('#open-options').click(() => apiCommandExec('options'));
+    $('#open-help').click(() => apiCommandExec('help'));
 
     optionsLoad().then(options => {
         const toggle = $('#enable-search');
         toggle.prop('checked', options.general.enable).change();
         toggle.bootstrapToggle();
-        toggle.change(() => utilCommandDispatch('toggle'));
+        toggle.change(() => apiCommandExec('toggle'));
     });
 });
-- 
cgit v1.2.3


From 257c864bb5ca5ef9afb4d92b9d29a7f479bc50b4 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Aug 2017 14:57:33 -0700
Subject: fix anki

---
 ext/bg/js/api.js        | 60 +++++--------------------------------------------
 ext/bg/js/dictionary.js | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 54 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 103d247c..36e283b9 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -17,56 +17,6 @@
  */
 
 
-/*
- * Helpers
- */
-
-function utilNoteFormat(definition, mode) {
-    const options = chrome.extension.getBackgroundPage().yomichan.options;
-    const note = {fields: {}, tags: options.anki.tags};
-    let fields = [];
-
-    if (mode === 'kanji') {
-        fields = options.anki.kanji.fields;
-        note.deckName = options.anki.kanji.deck;
-        note.modelName = options.anki.kanji.model;
-    } else {
-        fields = options.anki.terms.fields;
-        note.deckName = options.anki.terms.deck;
-        note.modelName = options.anki.terms.model;
-
-        if (definition.audio) {
-            const audio = {
-                url: definition.audio.url,
-                filename: definition.audio.filename,
-                skipHash: '7e2c2f954ef6051373ba916f000168dc',
-                fields: []
-            };
-
-            for (const name in fields) {
-                if (fields[name].includes('{audio}')) {
-                    audio.fields.push(name);
-                }
-            }
-
-            if (audio.fields.length > 0) {
-                note.audio = audio;
-            }
-        }
-    }
-
-    for (const name in fields) {
-        note.fields[name] = dictFieldFormat(fields[name], definition, mode, options);
-    }
-
-    return note;
-}
-
-
-/*
- * API
- */
-
 async function apiCommandExec(command) {
     const handlers = {
         search: () => {
@@ -159,9 +109,9 @@ async function apiKanjiFind(text) {
 
 async function apiDefinitionAdd(definition, mode) {
     const yomichan = chrome.extension.getBackgroundPage().yomichan;
+    const options = yomichan.options;
 
     if (mode !== 'kanji') {
-        const options = yomichan.options;
         await audioInject(
             definition,
             options.anki.terms.fields,
@@ -169,18 +119,20 @@ async function apiDefinitionAdd(definition, mode) {
         );
     }
 
-    return yomichan.anki.addNote(utilNoteFormat(definition, mode));
+    return yomichan.anki.addNote(dictNoteFormat(definition, mode, options));
 }
 
 async function apiDefinitionsAddable(definitions, modes) {
+    const yomichan = chrome.extension.getBackgroundPage().yomichan;
+    const options = yomichan.options;
+
     const notes = [];
     for (const definition of definitions) {
         for (const mode of modes) {
-            notes.push(utilNoteFormat(definition, mode));
+            notes.push(dictNoteFormat(definition, mode, options));
         }
     }
 
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
     const results = await yomichan.anki.canAddNotes(notes);
     const states = [];
     for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 73efe7d1..6f9b30e4 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -231,3 +231,43 @@ function dictFieldFormat(field, definition, mode, options) {
 
     return field;
 }
+
+function dictNoteFormat(definition, mode, options) {
+    const note = {fields: {}, tags: options.anki.tags};
+    let fields = [];
+
+    if (mode === 'kanji') {
+        fields = options.anki.kanji.fields;
+        note.deckName = options.anki.kanji.deck;
+        note.modelName = options.anki.kanji.model;
+    } else {
+        fields = options.anki.terms.fields;
+        note.deckName = options.anki.terms.deck;
+        note.modelName = options.anki.terms.model;
+
+        if (definition.audio) {
+            const audio = {
+                url: definition.audio.url,
+                filename: definition.audio.filename,
+                skipHash: '7e2c2f954ef6051373ba916f000168dc',
+                fields: []
+            };
+
+            for (const name in fields) {
+                if (fields[name].includes('{audio}')) {
+                    audio.fields.push(name);
+                }
+            }
+
+            if (audio.fields.length > 0) {
+                note.audio = audio;
+            }
+        }
+    }
+
+    for (const name in fields) {
+        note.fields[name] = dictFieldFormat(fields[name], definition, mode, options);
+    }
+
+    return note;
+}
-- 
cgit v1.2.3


From 8e1c6776d1a6149c222ac0bda6b7b0d373453d11 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Aug 2017 19:02:03 -0700
Subject: more cleanup

---
 ext/bg/js/api.js      | 113 +++++++++++++++++----------------------
 ext/bg/js/backend.js  | 143 +++++++++++++++++++++++++++++++-------------------
 ext/bg/js/settings.js |  18 +++----
 3 files changed, 144 insertions(+), 130 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 36e283b9..9dbb69c1 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -17,72 +17,34 @@
  */
 
 
-async function apiCommandExec(command) {
-    const handlers = {
-        search: () => {
-            chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
-        },
-
-        help: () => {
-            chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
-        },
+/*
+ * Backend
+ */
 
-        options: () => {
-            chrome.runtime.openOptionsPage();
-        },
+function backend() {
+    return chrome.extension.getBackgroundPage().yomichan_backend;
+}
 
-        toggle: () => {
-            const options = chrome.extension.getBackgroundPage().yomichan.options;
-            options.general.enable = !options.general.enable;
-            optionsSave(options).then(() => apiOptionsSet(options));
-        }
-    };
 
-    const handler = handlers[command];
-    if (handler) {
-        handler();
-    }
-}
+/*
+ * API
+ */
 
 async function apiOptionsSet(options) {
     // In Firefox, setting options from the options UI somehow carries references
     // to the DOM across to the background page, causing the options object to
     // become a "DeadObject" after the options page is closed. The workaround used
     // here is to create a deep copy of the options object.
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    yomichan.options = JSON.parse(JSON.stringify(options));
-
-    if (!options.general.enable) {
-        chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
-        chrome.browserAction.setBadgeText({text: 'off'});
-    } else if (!dictConfigured(options)) {
-        chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
-        chrome.browserAction.setBadgeText({text: '!'});
-    } else {
-        chrome.browserAction.setBadgeText({text: ''});
-    }
-
-    if (options.anki.enable) {
-        yomichan.anki = new AnkiConnect(options.anki.server);
-    } else {
-        yomichan.anki = new AnkiNull();
-    }
-
-    chrome.tabs.query({}, tabs => {
-        for (const tab of tabs) {
-            chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
-        }
-    });
+    backend().optionsSet(JSON.parse(JSON.stringify(options)));
 }
 
 async function apiOptionsGet() {
-    return chrome.extension.getBackgroundPage().yomichan.options;
+    return backend().options;
 }
 
 async function apiTermsFind(text) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    const options = yomichan.options;
-    const translator = yomichan.translator;
+    const options = backend().options;
+    const translator = backend().translator;
 
     const searcher = options.general.groupResults ?
         translator.findTermsGrouped.bind(translator) :
@@ -101,15 +63,13 @@ async function apiTermsFind(text) {
 }
 
 async function apiKanjiFind(text) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    const options = yomichan.options;
-    const definitions = await yomichan.translator.findKanji(text, dictEnabledSet(options));
+    const options = backend().options;
+    const definitions = await backend().translator.findKanji(text, dictEnabledSet(options));
     return definitions.slice(0, options.general.maxResults);
 }
 
 async function apiDefinitionAdd(definition, mode) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    const options = yomichan.options;
+    const options = backend().options;
 
     if (mode !== 'kanji') {
         await audioInject(
@@ -119,21 +79,18 @@ async function apiDefinitionAdd(definition, mode) {
         );
     }
 
-    return yomichan.anki.addNote(dictNoteFormat(definition, mode, options));
+    return backend().anki.addNote(dictNoteFormat(definition, mode, options));
 }
 
 async function apiDefinitionsAddable(definitions, modes) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    const options = yomichan.options;
-
     const notes = [];
     for (const definition of definitions) {
         for (const mode of modes) {
-            notes.push(dictNoteFormat(definition, mode, options));
+            notes.push(dictNoteFormat(definition, mode, backend().options));
         }
     }
 
-    const results = await yomichan.anki.canAddNotes(notes);
+    const results = await backend().anki.canAddNotes(notes);
     const states = [];
     for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
         const state = {};
@@ -148,10 +105,38 @@ async function apiDefinitionsAddable(definitions, modes) {
 }
 
 async function apiNoteView(noteId) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.anki.guiBrowse(`nid:${noteId}`);
+    return backend().anki.guiBrowse(`nid:${noteId}`);
 }
 
 async function apiTemplateRender(template, data) {
     return handlebarsRender(template, data);
 }
+
+async function apiCommandExec(command) {
+    const handlers = {
+        search: () => {
+            chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
+        },
+
+        help: () => {
+            chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
+        },
+
+        options: () => {
+            chrome.runtime.openOptionsPage();
+        },
+
+        toggle: async () => {
+            const options = backend().options;
+            options.general.enable = !options.general.enable;
+            await optionsSave(options);
+            await apiOptionsSet(options);
+        }
+    };
+
+    const handler = handlers[command];
+    if (handler) {
+        handler();
+    }
+}
+
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 2f60b4b7..6b345e6d 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -17,67 +17,102 @@
  */
 
 
-window.yomichan = new class {
+window.yomichan_backend = new class {
     constructor() {
         this.translator = new Translator();
         this.anki = new AnkiNull();
         this.options = null;
+    }
 
-        this.translator.prepare().then(optionsLoad).then(options => {
-            apiOptionsSet(options);
-
-            chrome.commands.onCommand.addListener(apiCommandExec);
-            chrome.runtime.onMessage.addListener(({action, params}, sender, callback) => {
-                const forward = (promise, callback) => {
-                    return promise.then(result => {
-                        callback({result});
-                    }).catch(error => {
-                        callback({error});
-                    });
-                };
-
-                const handlers = {
-                    optionsGet: ({callback}) => {
-                        forward(optionsLoad(), callback);
-                    },
-
-                    kanjiFind: ({text, callback}) => {
-                        forward(apiKanjiFind(text), callback);
-                    },
-
-                    termsFind: ({text, callback}) => {
-                        forward(apiTermsFind(text), callback);
-                    },
-
-                    templateRender: ({template, data, callback}) => {
-                        forward(apiTemplateRender(template, data), callback);
-                    },
-
-                    definitionAdd: ({definition, mode, callback}) => {
-                        forward(apiDefinitionAdd(definition, mode), callback);
-                    },
-
-                    definitionsAddable: ({definitions, modes, callback}) => {
-                        forward(apiDefinitionsAddable(definitions, modes), callback);
-                    },
-
-                    noteView: ({noteId}) => {
-                        forward(apiNoteView(noteId), callback);
-                    }
-                };
-
-                const handler = handlers[action];
-                if (handler) {
-                    params.callback = callback;
-                    handler(params);
-                }
-
-                return true;
-            });
+    async prepare() {
+        await this.translator.prepare();
+        await apiOptionsSet(await optionsLoad());
+
+        chrome.commands.onCommand.addListener(this.onCommand.bind(this));
+        chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
+
+        if (this.options.general.showGuide) {
+            chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
+        }
+    }
+
+    optionsSet(options) {
+        this.options = options;
 
-            if (options.general.showGuide) {
-                chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
+        if (!options.general.enable) {
+            chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
+            chrome.browserAction.setBadgeText({text: 'off'});
+        } else if (!dictConfigured(options)) {
+            chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
+            chrome.browserAction.setBadgeText({text: '!'});
+        } else {
+            chrome.browserAction.setBadgeText({text: ''});
+        }
+
+        if (options.anki.enable) {
+            backend().anki = new AnkiConnect(options.anki.server);
+        } else {
+            backend().anki = new AnkiNull();
+        }
+
+        chrome.tabs.query({}, tabs => {
+            for (const tab of tabs) {
+                chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
             }
         });
     }
+
+    onCommand(command) {
+        apiCommandExec(command);
+    }
+
+    onMessage({action, params}, sender, callback) {
+        const forward = (promise, callback) => {
+            return promise.then(result => {
+                callback({result});
+            }).catch(error => {
+                callback({error});
+            });
+        };
+
+        const handlers = {
+            optionsGet: ({callback}) => {
+                forward(optionsLoad(), callback);
+            },
+
+            kanjiFind: ({text, callback}) => {
+                forward(apiKanjiFind(text), callback);
+            },
+
+            termsFind: ({text, callback}) => {
+                forward(apiTermsFind(text), callback);
+            },
+
+            templateRender: ({template, data, callback}) => {
+                forward(apiTemplateRender(template, data), callback);
+            },
+
+            definitionAdd: ({definition, mode, callback}) => {
+                forward(apiDefinitionAdd(definition, mode), callback);
+            },
+
+            definitionsAddable: ({definitions, modes, callback}) => {
+                forward(apiDefinitionsAddable(definitions, modes), callback);
+            },
+
+            noteView: ({noteId}) => {
+                forward(apiNoteView(noteId), callback);
+            }
+        };
+
+        const handler = handlers[action];
+        if (handler) {
+            params.callback = callback;
+            handler(params);
+        }
+
+        return true;
+    }
 };
+
+window.yomichan_backend.prepare();
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index fa44c8da..1edbab01 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -22,33 +22,27 @@
  */
 
 function utilAnkiGetModelNames() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.anki.getModelNames();
+    return backend().anki.getModelNames();
 }
 
 function utilAnkiGetDeckNames() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.anki.getDeckNames();
+    return backend().anki.getDeckNames();
 }
 
 function utilAnkiGetModelFieldNames(modelName) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.anki.getModelFieldNames(modelName);
+    return backend().anki.getModelFieldNames(modelName);
 }
 
 function utilDatabaseGetDictionaries() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.translator.database.getDictionaries();
+    return backend().translator.database.getDictionaries();
 }
 
 function utilDatabasePurge() {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.translator.database.purge();
+    return backend().translator.database.purge();
 }
 
 function utilDatabaseImport(data, progress) {
-    const yomichan = chrome.extension.getBackgroundPage().yomichan;
-    return yomichan.translator.database.importDictionary(data, progress);
+    return backend().translator.database.importDictionary(data, progress);
 }
 
 
-- 
cgit v1.2.3


From dfecef1f23435c933237794de6665f6fbacf90ec Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Aug 2017 19:11:06 -0700
Subject: more cleanup

---
 ext/bg/js/api.js            |  2 +-
 ext/bg/js/backend.js        |  2 +-
 ext/bg/js/display-window.js | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 9dbb69c1..bc2693e5 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -35,7 +35,7 @@ async function apiOptionsSet(options) {
     // to the DOM across to the background page, causing the options object to
     // become a "DeadObject" after the options page is closed. The workaround used
     // here is to create a deep copy of the options object.
-    backend().optionsSet(JSON.parse(JSON.stringify(options)));
+    backend().onOptionsUpdated(JSON.parse(JSON.stringify(options)));
 }
 
 async function apiOptionsGet() {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 6b345e6d..1c058433 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -36,7 +36,7 @@ window.yomichan_backend = new class {
         }
     }
 
-    optionsSet(options) {
+    onOptionsUpdated(options) {
         this.options = options;
 
         if (!options.general.enable) {
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
index 1f607510..52c0cafa 100644
--- a/ext/bg/js/display-window.js
+++ b/ext/bg/js/display-window.js
@@ -21,12 +21,11 @@ window.displayWindow = new class extends Display {
     constructor() {
         super($('#spinner'), $('#content'));
 
-        const search = $('#search');
-        search.click(this.onSearch.bind(this));
+        this.search = $('#search').click(this.onSearch.bind(this));
+        this.query = $('#query').on('input', this.inputSearch.bind(this));
+        this.intro = $('#intro');
 
-        const query = $('#query');
-        query.on('input', () => search.prop('disabled', query.val().length === 0));
-        window.wanakana.bind(query.get(0));
+        window.wanakana.bind(this.query.get(0));
     }
 
     handleError(error) {
@@ -34,15 +33,19 @@ window.displayWindow = new class extends Display {
     }
 
     clearSearch() {
-        $('#query').focus().select();
+        this.query.focus().select();
+    }
+
+    inputSearch() {
+        this.search.prop('disabled', this.query.val().length === 0);
     }
 
     async onSearch(e) {
         e.preventDefault();
 
         try {
-            $('#intro').slideUp();
-            const {length, definitions} = await apiTermsFind($('#query').val());
+            this.intro.slideUp();
+            const {length, definitions} = await apiTermsFind(this.query.val());
             super.showTermDefs(definitions, await apiOptionsGet());
         } catch (e) {
             this.handleError(e);
-- 
cgit v1.2.3


From 7e635d6382b0d96f596e2440b93e5935230367aa Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Aug 2017 19:23:17 -0700
Subject: more cleanup

---
 ext/bg/background.html |  1 +
 ext/bg/js/api.js       | 37 ++++++++++++-------------------------
 ext/bg/js/backend.js   |  4 ++--
 ext/bg/js/settings.js  | 33 ---------------------------------
 ext/bg/js/util.js      | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/settings.html   |  1 +
 6 files changed, 62 insertions(+), 60 deletions(-)
 create mode 100644 ext/bg/js/util.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 1e9f3809..40f37b11 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -19,6 +19,7 @@
         <script src="/bg/js/options.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>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/request.js"></script>
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index bc2693e5..024ba75e 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -17,34 +17,21 @@
  */
 
 
-/*
- * Backend
- */
-
-function backend() {
-    return chrome.extension.getBackgroundPage().yomichan_backend;
-}
-
-
-/*
- * API
- */
-
 async function apiOptionsSet(options) {
     // In Firefox, setting options from the options UI somehow carries references
     // to the DOM across to the background page, causing the options object to
     // become a "DeadObject" after the options page is closed. The workaround used
     // here is to create a deep copy of the options object.
-    backend().onOptionsUpdated(JSON.parse(JSON.stringify(options)));
+    utilBackend().onOptionsUpdated(JSON.parse(JSON.stringify(options)));
 }
 
 async function apiOptionsGet() {
-    return backend().options;
+    return utilBackend().options;
 }
 
 async function apiTermsFind(text) {
-    const options = backend().options;
-    const translator = backend().translator;
+    const options = utilBackend().options;
+    const translator = utilBackend().translator;
 
     const searcher = options.general.groupResults ?
         translator.findTermsGrouped.bind(translator) :
@@ -63,13 +50,13 @@ async function apiTermsFind(text) {
 }
 
 async function apiKanjiFind(text) {
-    const options = backend().options;
-    const definitions = await backend().translator.findKanji(text, dictEnabledSet(options));
+    const options = utilBackend().options;
+    const definitions = await utilBackend().translator.findKanji(text, dictEnabledSet(options));
     return definitions.slice(0, options.general.maxResults);
 }
 
 async function apiDefinitionAdd(definition, mode) {
-    const options = backend().options;
+    const options = utilBackend().options;
 
     if (mode !== 'kanji') {
         await audioInject(
@@ -79,18 +66,18 @@ async function apiDefinitionAdd(definition, mode) {
         );
     }
 
-    return backend().anki.addNote(dictNoteFormat(definition, mode, options));
+    return utilBackend().anki.addNote(dictNoteFormat(definition, mode, options));
 }
 
 async function apiDefinitionsAddable(definitions, modes) {
     const notes = [];
     for (const definition of definitions) {
         for (const mode of modes) {
-            notes.push(dictNoteFormat(definition, mode, backend().options));
+            notes.push(dictNoteFormat(definition, mode, utilBackend().options));
         }
     }
 
-    const results = await backend().anki.canAddNotes(notes);
+    const results = await utilBackend().anki.canAddNotes(notes);
     const states = [];
     for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
         const state = {};
@@ -105,7 +92,7 @@ async function apiDefinitionsAddable(definitions, modes) {
 }
 
 async function apiNoteView(noteId) {
-    return backend().anki.guiBrowse(`nid:${noteId}`);
+    return utilBackend().anki.guiBrowse(`nid:${noteId}`);
 }
 
 async function apiTemplateRender(template, data) {
@@ -127,7 +114,7 @@ async function apiCommandExec(command) {
         },
 
         toggle: async () => {
-            const options = backend().options;
+            const options = utilBackend().options;
             options.general.enable = !options.general.enable;
             await optionsSave(options);
             await apiOptionsSet(options);
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 1c058433..f61e9742 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -50,9 +50,9 @@ window.yomichan_backend = new class {
         }
 
         if (options.anki.enable) {
-            backend().anki = new AnkiConnect(options.anki.server);
+            this.anki = new AnkiConnect(options.anki.server);
         } else {
-            backend().anki = new AnkiNull();
+            this.anki = new AnkiNull();
         }
 
         chrome.tabs.query({}, tabs => {
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 1edbab01..ce9e14a2 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -17,39 +17,6 @@
  */
 
 
-/*
- * Utilities
- */
-
-function utilAnkiGetModelNames() {
-    return backend().anki.getModelNames();
-}
-
-function utilAnkiGetDeckNames() {
-    return backend().anki.getDeckNames();
-}
-
-function utilAnkiGetModelFieldNames(modelName) {
-    return backend().anki.getModelFieldNames(modelName);
-}
-
-function utilDatabaseGetDictionaries() {
-    return backend().translator.database.getDictionaries();
-}
-
-function utilDatabasePurge() {
-    return backend().translator.database.purge();
-}
-
-function utilDatabaseImport(data, progress) {
-    return backend().translator.database.importDictionary(data, progress);
-}
-
-
-/*
- * General
- */
-
 async function formRead() {
     const optionsOld = await optionsLoad();
     const optionsNew = $.extend(true, {}, optionsOld);
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
new file mode 100644
index 00000000..9dc57950
--- /dev/null
+++ b/ext/bg/js/util.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016  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/>.
+ */
+
+
+function utilBackend() {
+    return chrome.extension.getBackgroundPage().yomichan_backend;
+}
+
+function utilAnkiGetModelNames() {
+    return utilBackend().anki.getModelNames();
+}
+
+function utilAnkiGetDeckNames() {
+    return utilBackend().anki.getDeckNames();
+}
+
+function utilAnkiGetModelFieldNames(modelName) {
+    return utilBackend().anki.getModelFieldNames(modelName);
+}
+
+function utilDatabaseGetDictionaries() {
+    return utilBackend().translator.database.getDictionaries();
+}
+
+function utilDatabasePurge() {
+    return utilBackend().translator.database.purge();
+}
+
+function utilDatabaseImport(data, progress) {
+    return utilBackend().translator.database.importDictionary(data, progress);
+}
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 7833a21d..719c67a2 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -283,6 +283,7 @@
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/templates.js"></script>
+        <script src="/bg/js/util.js"></script>
         <script src="/mixed/js/japanese.js"></script>
         <script src="/mixed/js/request.js"></script>
 
-- 
cgit v1.2.3


From aac2a58b5f821c6f90c95bb19f3b0a755d5e1739 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 13 Aug 2017 16:11:51 -0700
Subject: wip

---
 ext/bg/background.html      |   1 +
 ext/bg/js/display-window.js |  14 +-
 ext/bg/search.html          |   2 +-
 ext/fg/frame.html           |   4 +-
 ext/fg/js/display-frame.js  |  58 +++-----
 ext/fg/js/frontend.js       | 141 +++++++++---------
 ext/fg/js/util.js           |   2 +-
 ext/mixed/js/display.js     | 344 ++++++++++++++++++++++++--------------------
 8 files changed, 291 insertions(+), 275 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 40f37b11..fd3b7dd1 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -20,6 +20,7 @@
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/translator.js"></script>
         <script src="/bg/js/util.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="/mixed/js/request.js"></script>
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
index 52c0cafa..cbb96681 100644
--- a/ext/bg/js/display-window.js
+++ b/ext/bg/js/display-window.js
@@ -17,26 +17,26 @@
  */
 
 
-window.displayWindow = new class extends Display {
+window.yomichan_window = new class extends Display {
     constructor() {
         super($('#spinner'), $('#content'));
 
         this.search = $('#search').click(this.onSearch.bind(this));
-        this.query = $('#query').on('input', this.inputSearch.bind(this));
+        this.query = $('#query').on('input', this.onSearchInput.bind(this));
         this.intro = $('#intro');
 
         window.wanakana.bind(this.query.get(0));
     }
 
-    handleError(error) {
+    onError(error) {
         window.alert(`Error: ${error}`);
     }
 
-    clearSearch() {
+    onSearchClear() {
         this.query.focus().select();
     }
 
-    inputSearch() {
+    onSearchInput() {
         this.search.prop('disabled', this.query.val().length === 0);
     }
 
@@ -46,9 +46,9 @@ window.displayWindow = new class extends Display {
         try {
             this.intro.slideUp();
             const {length, definitions} = await apiTermsFind(this.query.val());
-            super.showTermDefs(definitions, await apiOptionsGet());
+            super.termsShow(definitions, await apiOptionsGet());
         } catch (e) {
-            this.handleError(e);
+            this.onError(e);
         }
     }
 };
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 655d7819..fe44d74e 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -40,10 +40,10 @@
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/templates.js"></script>
+        <script src="/bg/js/util.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/js/japanese.js"></script>
-        <script src="/mixed/js/request.js"></script>
 
         <script src="/bg/js/display-window.js"></script>
     </body>
diff --git a/ext/fg/frame.html b/ext/fg/frame.html
index 3fe42eb2..dda3ef06 100644
--- a/ext/fg/frame.html
+++ b/ext/fg/frame.html
@@ -18,9 +18,9 @@
             <img src="/mixed/img/spinner.gif">
         </div>
 
-        <div id="content"></div>
+        <div id="definitions"></div>
 
-        <div id="orphan">
+        <div id="error-orphaned">
             <div class="container-fluid">
                 <h1>Yomichan Updated!</h1>
                 <p>
diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/display-frame.js
index 09bd9255..5ea376c2 100644
--- a/ext/fg/js/display-frame.js
+++ b/ext/fg/js/display-frame.js
@@ -17,65 +17,45 @@
  */
 
 
-window.displayFrame = new class extends Display {
+window.yomichan_frame = new class extends Display {
     constructor() {
         super($('#spinner'), $('#content'));
         $(window).on('message', this.onMessage.bind(this));
     }
 
-    definitionAdd(definition, mode) {
-        return apiDefinitionAdd(definition, mode);
-    }
-
-    definitionsAddable(definitions, modes) {
-        return apiDefinitionsAddable(definitions, modes);
-    }
-
-    noteView(noteId) {
-        return apiNoteView(noteId);
-    }
-
-    templateRender(template, data) {
-        return apiTemplateRender(template, data);
-    }
-
-    kanjiFind(character) {
-        return apiKanjiFind(character);
-    }
-
-    handleError(error) {
-        if (window.yomichanOrphaned) {
-            this.showOrphaned();
+    onError(error) {
+        if (window.yomichan_orphaned) {
+            this.onOrphaned();
         } else {
             window.alert(`Error: ${error}`);
         }
     }
 
-    clearSearch() {
-        window.parent.postMessage('popupClose', '*');
+    onOrphaned() {
+        $('#definitions').hide();
+        $('#error-orphaned').show();
     }
 
-    selectionCopy() {
-        window.parent.postMessage('selectionCopy', '*');
+    onSearchClear() {
+        window.parent.postMessage('popupClose', '*');
     }
 
-    showOrphaned() {
-        $('#content').hide();
-        $('#orphan').show();
+    onSelectionCopy() {
+        window.parent.postMessage('selectionCopy', '*');
     }
 
     onMessage(e) {
         const handlers = {
-            showTermDefs: ({definitions, options, context}) => {
-                this.showTermDefs(definitions, options, context);
+            termsShow: ({definitions, options, context}) => {
+                this.termsShow(definitions, options, context);
             },
 
-            showKanjiDefs: ({definitions, options, context}) => {
-                this.showKanjiDefs(definitions, options, context);
+            kanjiShow: ({definitions, options, context}) => {
+                this.kanjiShow(definitions, options, context);
             },
 
-            showOrphaned: () => {
-                this.showOrphaned();
+            orphaned: () => {
+                this.onOrphaned();
             }
         };
 
@@ -89,8 +69,8 @@ window.displayFrame = new class extends Display {
     onKeyDown(e) {
         const handlers = {
             67: /* c */ () => {
-                if (e.ctrlKey && window.getSelection().toString() === '') {
-                    this.selectionCopy();
+                if (e.ctrlKey && !window.getSelection().toString()) {
+                    this.onSelectionCopy();
                     return true;
                 }
             }
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 9974d878..37389766 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -17,7 +17,7 @@
  */
 
 
-window.yomichanFrontend = new class {
+window.yomichan_frontend = new class {
     constructor() {
         this.popup = new Popup();
         this.popupTimer = null;
@@ -27,17 +27,23 @@ window.yomichanFrontend = new class {
         this.lastTextSource = null;
         this.pendingLookup = false;
         this.options = null;
+    }
+
+    async prepare() {
+        try {
+            this.options = await apiOptionsGet();
+        } catch (e) {
+            this.onError(e);
+        }
 
-        apiOptionsGet().then(options => {
-            this.options = options;
-            window.addEventListener('mouseover', this.onMouseOver.bind(this));
-            window.addEventListener('mousedown', this.onMouseDown.bind(this));
-            window.addEventListener('mouseup', this.onMouseUp.bind(this));
-            window.addEventListener('mousemove', this.onMouseMove.bind(this));
-            window.addEventListener('resize', e => this.searchClear());
-            window.addEventListener('message', this.onFrameMessage.bind(this));
-            chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
-        }).catch(this.handleError.bind(this));
+        window.addEventListener('message', this.onFrameMessage.bind(this));
+        window.addEventListener('mousedown', this.onMouseDown.bind(this));
+        window.addEventListener('mousemove', this.onMouseMove.bind(this));
+        window.addEventListener('mouseover', this.onMouseOver.bind(this));
+        window.addEventListener('mouseup', this.onMouseUp.bind(this));
+        window.addEventListener('resize', this.onResize.bind(this));
+
+        chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
     }
 
     popupTimerSet(callback) {
@@ -144,7 +150,11 @@ window.yomichanFrontend = new class {
         callback();
     }
 
-    searchAt(point) {
+    onResize() {
+        this.onSearchClear();
+    }
+
+    async searchAt(point) {
         if (this.pendingLookup) {
             return;
         }
@@ -160,70 +170,69 @@ window.yomichanFrontend = new class {
         }
 
         this.pendingLookup = true;
-        this.searchTerms(textSource).then(found => {
-            if (!found) {
-                return this.searchKanji(textSource);
+
+        try {
+            if (!await this.searchTerms(textSource)) {
+                await this.searchKanji(textSource);
             }
-        }).catch(error => {
-            this.handleError(error, textSource);
-        }).then(() => {
-            docImposterDestroy();
-            this.pendingLookup = false;
-        });
+        } catch (e) {
+            this.onError(e);
+        }
+
+        docImposterDestroy();
+        this.pendingLookup = false;
     }
 
-    searchTerms(textSource) {
+    async searchTerms(textSource) {
         textSource.setEndOffset(this.options.scanning.length);
 
-        return apiTermsFind(textSource.text()).then(({definitions, length}) => {
-            if (definitions.length === 0) {
-                return false;
-            } else {
-                textSource.setEndOffset(length);
-
-                const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
-                const url = window.location.href;
-                this.popup.showTermDefs(
-                    textSource.getRect(),
-                    definitions,
-                    this.options,
-                    {sentence, url}
-                );
-
-                this.lastTextSource = textSource;
-                if (this.options.scanning.selectText) {
-                    textSource.select();
-                }
+        const {definitions, length} = await apiTermsFind(textSource.text());
+        if (definitions.length === 0) {
+            return false;
+        }
 
-                return true;
-            }
-        });
+        textSource.setEndOffset(length);
+
+        const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
+        const url = window.location.href;
+        this.popup.termsShow(
+            textSource.getRect(),
+            definitions,
+            this.options,
+            {sentence, url}
+        );
+
+        this.lastTextSource = textSource;
+        if (this.options.scanning.selectText) {
+            textSource.select();
+        }
+
+        return true;
     }
 
-    searchKanji(textSource) {
+    async searchKanji(textSource) {
         textSource.setEndOffset(1);
 
-        return apiKanjiFind(textSource.text()).then(definitions => {
-            if (definitions.length === 0) {
-                return false;
-            } else {
-                const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
-                const url = window.location.href;
-                this.popup.showKanjiDefs(
-                    textSource.getRect(),
-                    definitions,
-                    this.options,
-                    {sentence, url}
-                );
-
-                this.lastTextSource = textSource;
-                if (this.options.scanning.selectText) {
-                    textSource.select();
-                }
+        const definitions = await apiKanjiFind(textSource.text());
+        if (definitions.length === 0) {
+            return false;
+        }
 
-                return true;
-            }
-        });
+        const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
+        const url = window.location.href;
+        this.popup.showKanji(
+            textSource.getRect(),
+            definitions,
+            this.options,
+            {sentence, url}
+        );
+
+        this.lastTextSource = textSource;
+        if (this.options.scanning.selectText) {
+            textSource.select();
+        }
+
+        return true;
     }
 
     searchClear() {
@@ -238,7 +247,7 @@ window.yomichanFrontend = new class {
     }
 
     handleError(error, textSource) {
-        if (window.yomichanOrphaned) {
+        if (window.yomichan_orphaned) {
             if (textSource && this.options.scanning.modifier !== 'none') {
                 this.popup.showOrphaned(textSource.getRect(), this.options);
             }
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index 311fc065..afa895ba 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -28,7 +28,7 @@ function utilInvoke(action, params={}) {
                 }
             });
         } catch (e) {
-            window.yomichanOrphaned = true;
+            window.yomichan_orphaned = true;
             reject(e.message);
         }
     });
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index f408fb25..97dd7d5c 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -32,171 +32,57 @@ class Display {
         $(document).keydown(this.onKeyDown.bind(this));
     }
 
-    handleError(error) {
+    onError(error) {
         throw 'override me';
     }
 
-    clearSearch() {
+    onSearchClear() {
         throw 'override me';
     }
 
-    showTermDefs(definitions, options, context) {
-        window.focus();
-
-        this.spinner.hide();
-        this.definitions = definitions;
-        this.options = options;
-        this.context = context;
-
-        const sequence = ++this.sequence;
-        const params = {
-            definitions,
-            addable: options.anki.enable,
-            grouped: options.general.groupResults,
-            playback: options.general.audioSource !== 'disabled',
-            debug: options.general.debugInfo
-        };
-
-        if (context) {
-            for (const definition of definitions) {
-                if (context.sentence) {
-                    definition.cloze = Display.clozeBuild(context.sentence, definition.source);
-                }
-
-                definition.url = context.url;
-            }
-        }
-
-        apiTemplateRender('terms.html', params).then(content => {
-            this.container.html(content);
-            this.entryScroll(context && context.index || 0);
-
-            $('.action-add-note').click(this.onAddNote.bind(this));
-            $('.action-view-note').click(this.onViewNote.bind(this));
-            $('.action-play-audio').click(this.onPlayAudio.bind(this));
-            $('.kanji-link').click(this.onKanjiLookup.bind(this));
-
-            return this.adderButtonsUpdate(['term-kanji', 'term-kana'], sequence);
-        }).catch(this.handleError.bind(this));
-    }
-
-    showKanjiDefs(definitions, options, context) {
-        window.focus();
-
-        this.spinner.hide();
-        this.definitions = definitions;
-        this.options = options;
-        this.context = context;
-
-        const sequence = ++this.sequence;
-        const params = {
-            definitions,
-            source: context && context.source,
-            addable: options.anki.enable,
-            debug: options.general.debugInfo
-        };
-
-        if (context) {
-            for (const definition of definitions) {
-                if (context.sentence) {
-                    definition.cloze = Display.clozeBuild(context.sentence);
-                }
-
-                definition.url = context.url;
-            }
-        }
-
-        apiTemplateRender('kanji.html', params).then(content => {
-            this.container.html(content);
-            this.entryScroll(context && context.index || 0);
-
-            $('.action-add-note').click(this.onAddNote.bind(this));
-            $('.source-term').click(this.onSourceTerm.bind(this));
-
-            return this.adderButtonsUpdate(['kanji'], sequence);
-        }).catch(this.handleError.bind(this));
-    }
-
-    adderButtonsUpdate(modes, sequence) {
-        return apiDefinitionsAddable(this.definitions, modes).then(states => {
-            if (!states || sequence !== this.sequence) {
-                return;
-            }
-
-            states.forEach((state, index) => {
-                for (const mode in state) {
-                    const button = Display.adderButtonFind(index, mode);
-                    if (state[mode]) {
-                        button.removeClass('disabled');
-                    } else {
-                        button.addClass('disabled');
-                    }
-
-                    button.removeClass('pending');
-                }
-            });
-        });
-    }
-
-    entryScroll(index, smooth) {
-        index = Math.min(index, this.definitions.length - 1);
-        index = Math.max(index, 0);
-
-        $('.current').hide().eq(index).show();
-
-        const container = $('html,body').stop();
-        const entry = $('.entry').eq(index);
-        const target = index === 0 ? 0 : entry.offset().top;
-
-        if (smooth) {
-            container.animate({scrollTop: target}, 200);
-        } else {
-            container.scrollTop(target);
-        }
-
-        this.index = index;
-    }
-
-    onSourceTerm(e) {
+    onSourceTermView(e) {
         e.preventDefault();
         this.sourceBack();
     }
 
-    onKanjiLookup(e) {
-        e.preventDefault();
+    async onKanjiLookup(e) {
+        try {
+            e.preventDefault();
 
-        const link = $(e.target);
-        const context = {
-            source: {
-                definitions: this.definitions,
-                index: Display.entryIndexFind(link)
+            const link = $(e.target);
+            const context = {
+                source: {
+                    definitions: this.definitions,
+                    index: Display.entryIndexFind(link)
+                }
+            };
+
+            if (this.context) {
+                context.sentence = this.context.sentence;
+                context.url = this.context.url;
             }
-        };
 
-        if (this.context) {
-            context.sentence = this.context.sentence;
-            context.url = this.context.url;
+            const kanjiDefs = await apiKanjiFind(link.text());
+            this.kanjiShow(kanjiDefs, this.options, context);
+        } catch (e) {
+            this.onError(e);
         }
-
-        apiKanjiFind(link.text()).then(kanjiDefs => {
-            this.showKanjiDefs(kanjiDefs, this.options, context);
-        }).catch(this.handleError.bind(this));
     }
 
-    onPlayAudio(e) {
+    onAudioPlay(e) {
         e.preventDefault();
         const index = Display.entryIndexFind($(e.currentTarget));
         this.audioPlay(this.definitions[index]);
     }
 
-    onAddNote(e) {
+    onNoteAdd(e) {
         e.preventDefault();
         const link = $(e.currentTarget);
         const index = Display.entryIndexFind(link);
         this.noteAdd(this.definitions[index], link.data('mode'));
     }
 
-    onViewNote(e) {
+    onNoteView(e) {
         e.preventDefault();
         const link = $(e.currentTarget);
         const index = Display.entryIndexFind(link);
@@ -220,48 +106,48 @@ class Display {
 
         const handlers = {
             27: /* escape */ () => {
-                this.clearSearch();
+                this.onSearchClear();
                 return true;
             },
 
             33: /* page up */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index - 3, true);
+                    this.entryScrollIntoView(this.index - 3, true);
                     return true;
                 }
             },
 
             34: /* page down */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index + 3, true);
+                    this.entryScrollIntoView(this.index + 3, true);
                     return true;
                 }
             },
 
             35: /* end */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.definitions.length - 1, true);
+                    this.entryScrollIntoView(this.definitions.length - 1, true);
                     return true;
                 }
             },
 
             36: /* home */ () => {
                 if (e.altKey) {
-                    this.entryScroll(0, true);
+                    this.entryScrollIntoView(0, true);
                     return true;
                 }
             },
 
             38: /* up */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index - 1, true);
+                    this.entryScrollIntoView(this.index - 1, true);
                     return true;
                 }
             },
 
             40: /* down */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index + 1, true);
+                    this.entryScrollIntoView(this.index + 1, true);
                     return true;
                 }
             },
@@ -317,6 +203,135 @@ class Display {
         }
     }
 
+    async termsShow(definitions, options, context) {
+        try {
+            window.focus();
+
+            this.definitions = definitions;
+            this.options = options;
+            this.context = context;
+
+            const sequence = ++this.sequence;
+            const params = {
+                definitions,
+                addable: options.anki.enable,
+                grouped: options.general.groupResults,
+                playback: options.general.audioSource !== 'disabled',
+                debug: options.general.debugInfo
+            };
+
+            if (context) {
+                for (const definition of definitions) {
+                    if (context.sentence) {
+                        definition.cloze = Display.clozeBuild(context.sentence, definition.source);
+                    }
+
+                    definition.url = context.url;
+                }
+            }
+
+            const content = await apiTemplateRender('terms.html', params);
+            this.container.html(content);
+            this.entryScrollIntoView(context && context.index || 0);
+
+            $('.action-add-note').click(this.onNoteAdd.bind(this));
+            $('.action-view-note').click(this.onNoteView.bind(this));
+            $('.action-play-audio').click(this.onAudioPlay.bind(this));
+            $('.kanji-link').click(this.onKanjiLookup.bind(this));
+
+            await this.adderButtonUpdate(['term-kanji', 'term-kana'], sequence);
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+
+    async kanjiShow(definitions, options, context) {
+        try {
+            window.focus();
+
+            this.definitions = definitions;
+            this.options = options;
+            this.context = context;
+
+            const sequence = ++this.sequence;
+            const params = {
+                definitions,
+                source: context && context.source,
+                addable: options.anki.enable,
+                debug: options.general.debugInfo
+            };
+
+            if (context) {
+                for (const definition of definitions) {
+                    if (context.sentence) {
+                        definition.cloze = Display.clozeBuild(context.sentence);
+                    }
+
+                    definition.url = context.url;
+                }
+            }
+
+            const content = await apiTemplateRender('kanji.html', params);
+            this.container.html(content);
+            this.entryScrollIntoView(context && context.index || 0);
+
+            $('.action-add-note').click(this.onNoteAdd.bind(this));
+            $('.source-term').click(this.onSourceTermView.bind(this));
+
+            await this.adderButtonUpdate(['kanji'], sequence);
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+
+    async adderButtonUpdate(modes, sequence) {
+        try {
+            this.spinner.show();
+
+            const states = apiDefinitionsAddable(this.definitions, modes);
+            if (!states || sequence !== this.sequence) {
+                return;
+            }
+
+            for (let i = 0; i < states.length; ++i) {
+                const state = states[i];
+                for (const mode in state) {
+                    const button = Display.adderButtonFind(i, mode);
+                    if (state[mode]) {
+                        button.removeClass('disabled');
+                    } else {
+                        button.addClass('disabled');
+                    }
+
+                    button.removeClass('pending');
+                }
+            }
+        } catch (e) {
+            this.onError(e);
+        } finally {
+            this.spinner.hide();
+        }
+    }
+
+    entryScrollIntoView(index, smooth) {
+        index = Math.min(index, this.definitions.length - 1);
+        index = Math.max(index, 0);
+
+        $('.current').hide().eq(index).show();
+
+        const container = $('html,body').stop();
+        const entry = $('.entry').eq(index);
+        const target = index === 0 ? 0 : entry.offset().top;
+
+        if (smooth) {
+            container.animate({scrollTop: target}, 200);
+        } else {
+            container.scrollTop(target);
+        }
+
+        this.index = index;
+    }
+
     sourceBack() {
         if (this.context && this.context.source) {
             const context = {
@@ -325,35 +340,42 @@ class Display {
                 index: this.context.source.index
             };
 
-            this.showTermDefs(this.context.source.definitions, this.options, context);
+            this.termsShow(this.context.source.definitions, this.options, context);
         }
     }
 
-    noteAdd(definition, mode) {
-        this.spinner.show();
-        return apiDefinitionAdd(definition, mode).then(noteId => {
+    async noteAdd(definition, mode) {
+        try {
+            this.spinner.show();
+
+            const noteId = await apiDefinitionAdd(definition, mode);
             if (noteId) {
                 const index = this.definitions.indexOf(definition);
                 Display.adderButtonFind(index, mode).addClass('disabled');
                 Display.viewerButtonFind(index).removeClass('pending disabled').data('noteId', noteId);
             } else {
-                this.handleError('note could not be added');
+                throw 'note could note be added';
             }
-        }).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
+        } catch (e) {
+            this.onError(e);
+        } finally {
+            this.spinner.hide();
+        }
     }
 
-    audioPlay(definition) {
-        this.spinner.show();
-
-        for (const key in this.audioCache) {
-            this.audioCache[key].pause();
-        }
+    async audioPlay(definition) {
+        try {
+            this.spinner.show();
 
-        audioBuildUrl(definition, this.options.general.audioSource, this.responseCache).then(url => {
+            let url = await audioBuildUrl(definition, this.options.general.audioSource, this.responseCache);
             if (!url) {
                 url = '/mixed/mp3/button.mp3';
             }
 
+            for (const key in this.audioCache) {
+                this.audioCache[key].pause();
+            }
+
             let audio = this.audioCache[url];
             if (audio) {
                 audio.currentTime = 0;
@@ -371,7 +393,11 @@ class Display {
                     audio.play();
                 };
             }
-        }).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
+        } catch (e) {
+            this.onError(e);
+        } finally {
+            this.spinner.hide();
+        }
     }
 
     static clozeBuild(sentence, source) {
-- 
cgit v1.2.3


From 8b50dfe1e9a8be7b8d2a7c69b25bc04babfc1c0c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 13 Aug 2017 21:11:10 -0700
Subject: unify files

---
 ext/bg/background.html      |   4 +-
 ext/bg/js/anki-connect.js   |  69 -------------
 ext/bg/js/anki-null.js      |  44 ---------
 ext/bg/js/anki.js           |  95 ++++++++++++++++++
 ext/bg/js/backend.js        |   5 +-
 ext/fg/js/source-element.js |  77 ---------------
 ext/fg/js/source-range.js   | 176 ---------------------------------
 ext/fg/js/source.js         | 236 ++++++++++++++++++++++++++++++++++++++++++++
 ext/manifest.json           |   3 +-
 9 files changed, 336 insertions(+), 373 deletions(-)
 delete mode 100644 ext/bg/js/anki-connect.js
 delete mode 100644 ext/bg/js/anki-null.js
 create mode 100644 ext/bg/js/anki.js
 delete mode 100644 ext/fg/js/source-element.js
 delete mode 100644 ext/fg/js/source-range.js
 create mode 100644 ext/fg/js/source.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index fd3b7dd1..90ad9709 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -9,8 +9,7 @@
         <script src="/mixed/lib/jszip.min.js"></script>
         <script src="/mixed/lib/wanakana.min.js"></script>
 
-        <script src="/bg/js/anki-connect.js"></script>
-        <script src="/bg/js/anki-null.js"></script>
+        <script src="/bg/js/anki.js"></script>
         <script src="/bg/js/api.js"></script>
         <script src="/bg/js/database.js"></script>
         <script src="/bg/js/deinflector.js"></script>
@@ -20,7 +19,6 @@
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/translator.js"></script>
         <script src="/bg/js/util.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="/mixed/js/request.js"></script>
diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
deleted file mode 100644
index 80c075fd..00000000
--- a/ext/bg/js/anki-connect.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016  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 AnkiConnect {
-    constructor(server) {
-        this.server = server;
-        this.localVersion = 2;
-        this.remoteVersion = 0;
-    }
-
-    async addNote(note) {
-        await this.checkVersion();
-        return await this.ankiInvoke('addNote', {note});
-    }
-
-    async canAddNotes(notes) {
-        await this.checkVersion();
-        return await this.ankiInvoke('canAddNotes', {notes});
-    }
-
-    async getDeckNames() {
-        await this.checkVersion();
-        return await this.ankiInvoke('deckNames');
-    }
-
-    async getModelNames() {
-        await this.checkVersion();
-        return await this.ankiInvoke('modelNames');
-    }
-
-    async getModelFieldNames(modelName) {
-        await this.checkVersion();
-        return await this.ankiInvoke('modelFieldNames', {modelName});
-    }
-
-    async guiBrowse(query) {
-        await this.checkVersion();
-        return await this.ankiInvoke('guiBrowse', {query});
-    }
-
-    async checkVersion() {
-        if (this.remoteVersion < this.localVersion) {
-            this.remoteVersion = await this.ankiInvoke('version');
-            if (this.remoteVersion < this.localVersion) {
-                throw 'extension and plugin versions incompatible';
-            }
-        }
-    }
-
-    ankiInvoke(action, params) {
-        return requestJson(this.server, 'POST', {action, params, version: this.localVersion});
-    }
-}
diff --git a/ext/bg/js/anki-null.js b/ext/bg/js/anki-null.js
deleted file mode 100644
index d82f0e68..00000000
--- a/ext/bg/js/anki-null.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016  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 AnkiNull {
-    async addNote(note) {
-        return null;
-    }
-
-    async canAddNotes(notes) {
-        return [];
-    }
-
-    async getDeckNames() {
-        return [];
-    }
-
-    async getModelNames() {
-        return [];
-    }
-
-    async getModelFieldNames(modelName) {
-        return [];
-    }
-
-    async guiBrowse(query) {
-        return [];
-    }
-}
diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
new file mode 100644
index 00000000..f0ec4571
--- /dev/null
+++ b/ext/bg/js/anki.js
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2016  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 AnkiConnect {
+    constructor(server) {
+        this.server = server;
+        this.localVersion = 2;
+        this.remoteVersion = 0;
+    }
+
+    async addNote(note) {
+        await this.checkVersion();
+        return await this.ankiInvoke('addNote', {note});
+    }
+
+    async canAddNotes(notes) {
+        await this.checkVersion();
+        return await this.ankiInvoke('canAddNotes', {notes});
+    }
+
+    async getDeckNames() {
+        await this.checkVersion();
+        return await this.ankiInvoke('deckNames');
+    }
+
+    async getModelNames() {
+        await this.checkVersion();
+        return await this.ankiInvoke('modelNames');
+    }
+
+    async getModelFieldNames(modelName) {
+        await this.checkVersion();
+        return await this.ankiInvoke('modelFieldNames', {modelName});
+    }
+
+    async guiBrowse(query) {
+        await this.checkVersion();
+        return await this.ankiInvoke('guiBrowse', {query});
+    }
+
+    async checkVersion() {
+        if (this.remoteVersion < this.localVersion) {
+            this.remoteVersion = await this.ankiInvoke('version');
+            if (this.remoteVersion < this.localVersion) {
+                throw 'extension and plugin versions incompatible';
+            }
+        }
+    }
+
+    ankiInvoke(action, params) {
+        return requestJson(this.server, 'POST', {action, params, version: this.localVersion});
+    }
+}
+
+class AnkiNull {
+    async addNote(note) {
+        return null;
+    }
+
+    async canAddNotes(notes) {
+        return [];
+    }
+
+    async getDeckNames() {
+        return [];
+    }
+
+    async getModelNames() {
+        return [];
+    }
+
+    async getModelFieldNames(modelName) {
+        return [];
+    }
+
+    async guiBrowse(query) {
+        return [];
+    }
+}
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index f61e9742..e8c9452c 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -17,7 +17,7 @@
  */
 
 
-window.yomichan_backend = new class {
+class Backend {
     constructor() {
         this.translator = new Translator();
         this.anki = new AnkiNull();
@@ -113,6 +113,7 @@ window.yomichan_backend = new class {
 
         return true;
     }
-};
+}
 
+window.yomichan_backend = new Backend();
 window.yomichan_backend.prepare();
diff --git a/ext/fg/js/source-element.js b/ext/fg/js/source-element.js
deleted file mode 100644
index a8101382..00000000
--- a/ext/fg/js/source-element.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2016  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 TextSourceElement {
-    constructor(element, content='') {
-        this.element = element;
-        this.content = content;
-    }
-
-    clone() {
-        return new TextSourceElement(this.element, this.content);
-    }
-
-    text() {
-        return this.content;
-    }
-
-    setEndOffset(length) {
-        switch (this.element.nodeName) {
-            case 'BUTTON':
-                this.content = this.element.innerHTML;
-                break;
-            case 'IMG':
-                this.content = this.element.getAttribute('alt');
-                break;
-            default:
-                this.content = this.element.value;
-                break;
-        }
-
-        this.content = this.content || '';
-        this.content = this.content.substring(0, length);
-
-        return this.content.length;
-    }
-
-    setStartOffset(length) {
-        return 0;
-    }
-
-    containsPoint(point) {
-        const rect = this.getRect();
-        return point.x >= rect.left && point.x <= rect.right;
-    }
-
-    getRect() {
-        return this.element.getBoundingClientRect();
-    }
-
-    select() {
-        // NOP
-    }
-
-    deselect() {
-        // NOP
-    }
-
-    equals(other) {
-        return other.element === this.element && other.content === this.content;
-    }
-}
diff --git a/ext/fg/js/source-range.js b/ext/fg/js/source-range.js
deleted file mode 100644
index fa73b0a4..00000000
--- a/ext/fg/js/source-range.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2016  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 TextSourceRange {
-    constructor(range, content='') {
-        this.range = range;
-        this.content = content;
-    }
-
-    clone() {
-        return new TextSourceRange(this.range.cloneRange(), this.content);
-    }
-
-    text() {
-        return this.content;
-    }
-
-    setEndOffset(length) {
-        const state = TextSourceRange.seekForward(this.range.startContainer, this.range.startOffset, length);
-        this.range.setEnd(state.node, state.offset);
-        this.content = state.content;
-        return length - state.remainder;
-    }
-
-    setStartOffset(length) {
-        const state = TextSourceRange.seekBackward(this.range.startContainer, this.range.startOffset, length);
-        this.range.setStart(state.node, state.offset);
-        this.content = state.content;
-        return length - state.remainder;
-    }
-
-    containsPoint(point) {
-        const rect = this.getPaddedRect();
-        return point.x >= rect.left && point.x <= rect.right;
-    }
-
-    getRect() {
-        return this.range.getBoundingClientRect();
-    }
-
-    getPaddedRect() {
-        const range = this.range.cloneRange();
-        const startOffset = range.startOffset;
-        const endOffset = range.endOffset;
-        const node = range.startContainer;
-
-        range.setStart(node, Math.max(0, startOffset - 1));
-        range.setEnd(node, Math.min(node.length, endOffset + 1));
-
-        return range.getBoundingClientRect();
-    }
-
-    select() {
-        const selection = window.getSelection();
-        selection.removeAllRanges();
-        selection.addRange(this.range);
-    }
-
-    deselect() {
-        const selection = window.getSelection();
-        selection.removeAllRanges();
-    }
-
-    equals(other) {
-        return other.range && other.range.compareBoundaryPoints(Range.START_TO_START, this.range) === 0;
-    }
-
-    static shouldEnter(node) {
-        if (node.nodeType !== 1) {
-            return false;
-        }
-
-        const skip = ['RT', 'SCRIPT', 'STYLE'];
-        if (skip.includes(node.nodeName)) {
-            return false;
-        }
-
-        const style = window.getComputedStyle(node);
-        const hidden =
-            style.visibility === 'hidden' ||
-            style.display === 'none' ||
-            parseFloat(style.fontSize) === 0;
-
-        return !hidden;
-    }
-
-    static seekForward(node, offset, length) {
-        const state = {node, offset, remainder: length, content: ''};
-        if (!TextSourceRange.seekForwardHelper(node, state)) {
-            return state;
-        }
-
-        for (let current = node; current !== null; current = current.parentElement) {
-            for (let sibling = current.nextSibling; sibling !== null; sibling = sibling.nextSibling) {
-                if (!TextSourceRange.seekForwardHelper(sibling, state)) {
-                    return state;
-                }
-            }
-        }
-
-        return state;
-    }
-
-    static seekForwardHelper(node, state) {
-        if (node.nodeType === 3 && node.parentElement && TextSourceRange.shouldEnter(node.parentElement)) {
-            const offset = state.node === node ? state.offset : 0;
-            const remaining = node.length - offset;
-            const consumed = Math.min(remaining, state.remainder);
-            state.content = state.content + node.nodeValue.substring(offset, offset + consumed);
-            state.node = node;
-            state.offset = offset + consumed;
-            state.remainder -= consumed;
-        } else if (TextSourceRange.shouldEnter(node)) {
-            for (let i = 0; i < node.childNodes.length; ++i) {
-                if (!TextSourceRange.seekForwardHelper(node.childNodes[i], state)) {
-                    break;
-                }
-            }
-        }
-
-        return state.remainder > 0;
-    }
-
-    static seekBackward(node, offset, length) {
-        const state = {node, offset, remainder: length, content: ''};
-        if (!TextSourceRange.seekBackwardHelper(node, state)) {
-            return state;
-        }
-
-        for (let current = node; current !== null; current = current.parentElement) {
-            for (let sibling = current.previousSibling; sibling !== null; sibling = sibling.previousSibling) {
-                if (!TextSourceRange.seekBackwardHelper(sibling, state)) {
-                    return state;
-                }
-            }
-        }
-
-        return state;
-    }
-
-    static seekBackwardHelper(node, state) {
-        if (node.nodeType === 3 && node.parentElement && TextSourceRange.shouldEnter(node.parentElement)) {
-            const offset = state.node === node ? state.offset : node.length;
-            const remaining = offset;
-            const consumed = Math.min(remaining, state.remainder);
-            state.content = node.nodeValue.substring(offset - consumed, offset) + state.content;
-            state.node = node;
-            state.offset = offset - consumed;
-            state.remainder -= consumed;
-        } else if (TextSourceRange.shouldEnter(node)) {
-            for (let i = node.childNodes.length - 1; i >= 0; --i) {
-                if (!TextSourceRange.seekBackwardHelper(node.childNodes[i], state)) {
-                    break;
-                }
-            }
-        }
-
-        return state.remainder > 0;
-    }
-}
diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js
new file mode 100644
index 00000000..210dda12
--- /dev/null
+++ b/ext/fg/js/source.js
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2016  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 TextSourceRange {
+    constructor(range, content='') {
+        this.range = range;
+        this.content = content;
+    }
+
+    clone() {
+        return new TextSourceRange(this.range.cloneRange(), this.content);
+    }
+
+    text() {
+        return this.content;
+    }
+
+    setEndOffset(length) {
+        const state = TextSourceRange.seekForward(this.range.startContainer, this.range.startOffset, length);
+        this.range.setEnd(state.node, state.offset);
+        this.content = state.content;
+        return length - state.remainder;
+    }
+
+    setStartOffset(length) {
+        const state = TextSourceRange.seekBackward(this.range.startContainer, this.range.startOffset, length);
+        this.range.setStart(state.node, state.offset);
+        this.content = state.content;
+        return length - state.remainder;
+    }
+
+    containsPoint(point) {
+        const rect = this.getPaddedRect();
+        return point.x >= rect.left && point.x <= rect.right;
+    }
+
+    getRect() {
+        return this.range.getBoundingClientRect();
+    }
+
+    getPaddedRect() {
+        const range = this.range.cloneRange();
+        const startOffset = range.startOffset;
+        const endOffset = range.endOffset;
+        const node = range.startContainer;
+
+        range.setStart(node, Math.max(0, startOffset - 1));
+        range.setEnd(node, Math.min(node.length, endOffset + 1));
+
+        return range.getBoundingClientRect();
+    }
+
+    select() {
+        const selection = window.getSelection();
+        selection.removeAllRanges();
+        selection.addRange(this.range);
+    }
+
+    deselect() {
+        const selection = window.getSelection();
+        selection.removeAllRanges();
+    }
+
+    equals(other) {
+        return other.range && other.range.compareBoundaryPoints(Range.START_TO_START, this.range) === 0;
+    }
+
+    static shouldEnter(node) {
+        if (node.nodeType !== 1) {
+            return false;
+        }
+
+        const skip = ['RT', 'SCRIPT', 'STYLE'];
+        if (skip.includes(node.nodeName)) {
+            return false;
+        }
+
+        const style = window.getComputedStyle(node);
+        const hidden =
+            style.visibility === 'hidden' ||
+            style.display === 'none' ||
+            parseFloat(style.fontSize) === 0;
+
+        return !hidden;
+    }
+
+    static seekForward(node, offset, length) {
+        const state = {node, offset, remainder: length, content: ''};
+        if (!TextSourceRange.seekForwardHelper(node, state)) {
+            return state;
+        }
+
+        for (let current = node; current !== null; current = current.parentElement) {
+            for (let sibling = current.nextSibling; sibling !== null; sibling = sibling.nextSibling) {
+                if (!TextSourceRange.seekForwardHelper(sibling, state)) {
+                    return state;
+                }
+            }
+        }
+
+        return state;
+    }
+
+    static seekForwardHelper(node, state) {
+        if (node.nodeType === 3 && node.parentElement && TextSourceRange.shouldEnter(node.parentElement)) {
+            const offset = state.node === node ? state.offset : 0;
+            const remaining = node.length - offset;
+            const consumed = Math.min(remaining, state.remainder);
+            state.content = state.content + node.nodeValue.substring(offset, offset + consumed);
+            state.node = node;
+            state.offset = offset + consumed;
+            state.remainder -= consumed;
+        } else if (TextSourceRange.shouldEnter(node)) {
+            for (let i = 0; i < node.childNodes.length; ++i) {
+                if (!TextSourceRange.seekForwardHelper(node.childNodes[i], state)) {
+                    break;
+                }
+            }
+        }
+
+        return state.remainder > 0;
+    }
+
+    static seekBackward(node, offset, length) {
+        const state = {node, offset, remainder: length, content: ''};
+        if (!TextSourceRange.seekBackwardHelper(node, state)) {
+            return state;
+        }
+
+        for (let current = node; current !== null; current = current.parentElement) {
+            for (let sibling = current.previousSibling; sibling !== null; sibling = sibling.previousSibling) {
+                if (!TextSourceRange.seekBackwardHelper(sibling, state)) {
+                    return state;
+                }
+            }
+        }
+
+        return state;
+    }
+
+    static seekBackwardHelper(node, state) {
+        if (node.nodeType === 3 && node.parentElement && TextSourceRange.shouldEnter(node.parentElement)) {
+            const offset = state.node === node ? state.offset : node.length;
+            const remaining = offset;
+            const consumed = Math.min(remaining, state.remainder);
+            state.content = node.nodeValue.substring(offset - consumed, offset) + state.content;
+            state.node = node;
+            state.offset = offset - consumed;
+            state.remainder -= consumed;
+        } else if (TextSourceRange.shouldEnter(node)) {
+            for (let i = node.childNodes.length - 1; i >= 0; --i) {
+                if (!TextSourceRange.seekBackwardHelper(node.childNodes[i], state)) {
+                    break;
+                }
+            }
+        }
+
+        return state.remainder > 0;
+    }
+}
+
+
+class TextSourceElement {
+    constructor(element, content='') {
+        this.element = element;
+        this.content = content;
+    }
+
+    clone() {
+        return new TextSourceElement(this.element, this.content);
+    }
+
+    text() {
+        return this.content;
+    }
+
+    setEndOffset(length) {
+        switch (this.element.nodeName) {
+            case 'BUTTON':
+                this.content = this.element.innerHTML;
+                break;
+            case 'IMG':
+                this.content = this.element.getAttribute('alt');
+                break;
+            default:
+                this.content = this.element.value;
+                break;
+        }
+
+        this.content = this.content || '';
+        this.content = this.content.substring(0, length);
+
+        return this.content.length;
+    }
+
+    setStartOffset(length) {
+        return 0;
+    }
+
+    containsPoint(point) {
+        const rect = this.getRect();
+        return point.x >= rect.left && point.x <= rect.right;
+    }
+
+    getRect() {
+        return this.element.getBoundingClientRect();
+    }
+
+    select() {
+        // NOP
+    }
+
+    deselect() {
+        // NOP
+    }
+
+    equals(other) {
+        return other.element === this.element && other.content === this.content;
+    }
+}
diff --git a/ext/manifest.json b/ext/manifest.json
index 48308b17..ee3bd2ac 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -18,8 +18,7 @@
             "fg/js/api.js",
             "fg/js/document.js",
             "fg/js/popup.js",
-            "fg/js/source-element.js",
-            "fg/js/source-range.js",
+            "fg/js/source.js",
             "fg/js/util.js",
 
             "fg/js/frontend.js"
-- 
cgit v1.2.3


From 82863cd86156d48b9f18dc10a560bedb82641862 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 14 Aug 2017 19:55:04 -0700
Subject: renaming files

---
 ext/bg/context.html         |  43 +++++++++++++
 ext/bg/js/context.js        |  31 ++++++++++
 ext/bg/js/display-window.js |  54 ----------------
 ext/bg/js/popup.js          |  31 ----------
 ext/bg/js/search.js         |  56 +++++++++++++++++
 ext/bg/popup.html           |  43 -------------
 ext/bg/search.html          |   4 +-
 ext/fg/css/client.css       |   2 +-
 ext/fg/float.html           |  43 +++++++++++++
 ext/fg/frame.html           |  43 -------------
 ext/fg/js/display-frame.js  |  86 --------------------------
 ext/fg/js/float.js          |  88 ++++++++++++++++++++++++++
 ext/fg/js/popup.js          |   4 +-
 ext/manifest.json           |   5 +-
 ext/mixed/css/display.css   | 146 ++++++++++++++++++++++++++++++++++++++++++++
 ext/mixed/css/frame.css     | 146 --------------------------------------------
 16 files changed, 414 insertions(+), 411 deletions(-)
 create mode 100644 ext/bg/context.html
 create mode 100644 ext/bg/js/context.js
 delete mode 100644 ext/bg/js/display-window.js
 delete mode 100644 ext/bg/js/popup.js
 create mode 100644 ext/bg/js/search.js
 delete mode 100644 ext/bg/popup.html
 create mode 100644 ext/fg/float.html
 delete mode 100644 ext/fg/frame.html
 delete mode 100644 ext/fg/js/display-frame.js
 create mode 100644 ext/fg/js/float.js
 create mode 100644 ext/mixed/css/display.css
 delete mode 100644 ext/mixed/css/frame.css

(limited to 'ext/bg/js')

diff --git a/ext/bg/context.html b/ext/bg/context.html
new file mode 100644
index 00000000..3828c9fe
--- /dev/null
+++ b/ext/bg/context.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css">
+        <style type="text/css">
+            body {
+                padding: 10px;
+                text-align: center;
+            }
+
+            .btn-group {
+                display: flex;
+            }
+        </style>
+    </head>
+    <body>
+        <p>
+            <input type="checkbox" id="enable-search">
+        </p>
+        <p>
+            <div class="btn-group" style="white-space: nowrap">
+                <button type="button" id="open-search" title="Search (Alt + Insert)" class="btn btn-default btn-xs glyphicon glyphicon-search"></button>
+                <button type="button" id="open-options" title="Options" class="btn btn-default btn-xs glyphicon glyphicon-wrench"></button>
+                <button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
+            </div>
+        </p>
+
+        <script src="/mixed/lib/jquery.min.js"></script>
+        <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
+        <script src="/mixed/lib/handlebars.min.js"></script>
+
+        <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/bg/js/options.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
+        <script src="/mixed/js/request.js"></script>
+
+        <script src="/bg/js/context.js"></script>
+    </body>
+</html>
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
new file mode 100644
index 00000000..77cb5166
--- /dev/null
+++ b/ext/bg/js/context.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017  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/>.
+ */
+
+
+$(document).ready(() => {
+    $('#open-search').click(() => apiCommandExec('search'));
+    $('#open-options').click(() => apiCommandExec('options'));
+    $('#open-help').click(() => apiCommandExec('help'));
+
+    optionsLoad().then(options => {
+        const toggle = $('#enable-search');
+        toggle.prop('checked', options.general.enable).change();
+        toggle.bootstrapToggle();
+        toggle.change(() => apiCommandExec('toggle'));
+    });
+});
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
deleted file mode 100644
index cbb96681..00000000
--- a/ext/bg/js/display-window.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2016  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/>.
- */
-
-
-window.yomichan_window = new class extends Display {
-    constructor() {
-        super($('#spinner'), $('#content'));
-
-        this.search = $('#search').click(this.onSearch.bind(this));
-        this.query = $('#query').on('input', this.onSearchInput.bind(this));
-        this.intro = $('#intro');
-
-        window.wanakana.bind(this.query.get(0));
-    }
-
-    onError(error) {
-        window.alert(`Error: ${error}`);
-    }
-
-    onSearchClear() {
-        this.query.focus().select();
-    }
-
-    onSearchInput() {
-        this.search.prop('disabled', this.query.val().length === 0);
-    }
-
-    async onSearch(e) {
-        e.preventDefault();
-
-        try {
-            this.intro.slideUp();
-            const {length, definitions} = await apiTermsFind(this.query.val());
-            super.termsShow(definitions, await apiOptionsGet());
-        } catch (e) {
-            this.onError(e);
-        }
-    }
-};
diff --git a/ext/bg/js/popup.js b/ext/bg/js/popup.js
deleted file mode 100644
index 77cb5166..00000000
--- a/ext/bg/js/popup.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2017  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/>.
- */
-
-
-$(document).ready(() => {
-    $('#open-search').click(() => apiCommandExec('search'));
-    $('#open-options').click(() => apiCommandExec('options'));
-    $('#open-help').click(() => apiCommandExec('help'));
-
-    optionsLoad().then(options => {
-        const toggle = $('#enable-search');
-        toggle.prop('checked', options.general.enable).change();
-        toggle.bootstrapToggle();
-        toggle.change(() => apiCommandExec('toggle'));
-    });
-});
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
new file mode 100644
index 00000000..87f50c32
--- /dev/null
+++ b/ext/bg/js/search.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016  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 DisplaySearch extends Display {
+    constructor() {
+        super($('#spinner'), $('#content'));
+
+        this.search = $('#search').click(this.onSearch.bind(this));
+        this.query = $('#query').on('input', this.onSearchInput.bind(this));
+        this.intro = $('#intro');
+
+        window.wanakana.bind(this.query.get(0));
+    }
+
+    onError(error) {
+        window.alert(`Error: ${error}`);
+    }
+
+    onSearchClear() {
+        this.query.focus().select();
+    }
+
+    onSearchInput() {
+        this.search.prop('disabled', this.query.val().length === 0);
+    }
+
+    async onSearch(e) {
+        e.preventDefault();
+
+        try {
+            this.intro.slideUp();
+            const {length, definitions} = await apiTermsFind(this.query.val());
+            super.termsShow(definitions, await apiOptionsGet());
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+}
+
+window.yomichan_search = new DisplaySearch();
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
deleted file mode 100644
index 60253d6f..00000000
--- a/ext/bg/popup.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css">
-        <style type="text/css">
-            body {
-                padding: 10px;
-                text-align: center;
-            }
-
-            .btn-group {
-                display: flex;
-            }
-        </style>
-    </head>
-    <body>
-        <p>
-            <input type="checkbox" id="enable-search">
-        </p>
-        <p>
-            <div class="btn-group" style="white-space: nowrap">
-                <button type="button" id="open-search" title="Search (Alt + Insert)" class="btn btn-default btn-xs glyphicon glyphicon-search"></button>
-                <button type="button" id="open-options" title="Options" class="btn btn-default btn-xs glyphicon glyphicon-wrench"></button>
-                <button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
-            </div>
-        </p>
-
-        <script src="/mixed/lib/jquery.min.js"></script>
-        <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
-        <script src="/mixed/lib/handlebars.min.js"></script>
-
-        <script src="/bg/js/api.js"></script>
-        <script src="/bg/js/dictionary.js"></script>
-        <script src="/bg/js/options.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
-        <script src="/mixed/js/request.js"></script>
-
-        <script src="/bg/js/popup.js"></script>
-    </body>
-</html>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index fe44d74e..d10530f9 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -5,7 +5,7 @@
         <title>Yomichan Search</title>
         <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" type="text/css" href="/mixed/css/frame.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
     </head>
     <body>
         <div class="container-fluid">
@@ -45,6 +45,6 @@
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/js/japanese.js"></script>
 
-        <script src="/bg/js/display-window.js"></script>
+        <script src="/bg/js/search.js"></script>
     </body>
 </html>
diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css
index 9f566480..b5b1f6bd 100644
--- a/ext/fg/css/client.css
+++ b/ext/fg/css/client.css
@@ -17,7 +17,7 @@
  */
 
 
-iframe#yomichan-popup {
+iframe#yomichan-float {
     all: initial;
     background-color: #fff;
     border: 1px solid #999;
diff --git a/ext/fg/float.html b/ext/fg/float.html
new file mode 100644
index 00000000..a3b66c92
--- /dev/null
+++ b/ext/fg/float.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title></title>
+        <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
+        <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" href="/mixed/css/display.css">
+        <style type="text/css">
+            .entry, .note {
+                padding-left: 10px;
+                padding-right: 10px;
+            }
+        </style>
+    </head>
+    <body>
+        <div id="spinner">
+            <img src="/mixed/img/spinner.gif">
+        </div>
+
+        <div id="definitions"></div>
+
+        <div id="error-orphaned">
+            <div class="container-fluid">
+                <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.
+                </p>
+            </div>
+        </div>
+
+        <script src="/mixed/lib/jquery.min.js"></script>
+        <script src="/mixed/lib/wanakana.min.js"></script>
+
+        <script src="/fg/js/api.js"></script>
+        <script src="/fg/js/util.js"></script>
+        <script src="/mixed/js/audio.js"></script>
+        <script src="/mixed/js/display.js"></script>
+
+        <script src="/fg/js/float.js"></script>
+    </body>
+</html>
diff --git a/ext/fg/frame.html b/ext/fg/frame.html
deleted file mode 100644
index dda3ef06..00000000
--- a/ext/fg/frame.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <title></title>
-        <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
-        <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" href="/mixed/css/frame.css">
-        <style type="text/css">
-            .entry, .note {
-                padding-left: 10px;
-                padding-right: 10px;
-            }
-        </style>
-    </head>
-    <body>
-        <div id="spinner">
-            <img src="/mixed/img/spinner.gif">
-        </div>
-
-        <div id="definitions"></div>
-
-        <div id="error-orphaned">
-            <div class="container-fluid">
-                <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.
-                </p>
-            </div>
-        </div>
-
-        <script src="/fg/js/api.js"></script>
-        <script src="/fg/js/dictionary.js"></script>
-        <script src="/fg/js/util.js"></script>
-        <script src="/mixed/js/audio.js"></script>
-        <script src="/mixed/js/display.js"></script>
-        <script src="/mixed/lib/jquery.min.js"></script>
-        <script src="/mixed/lib/wanakana.min.js"></script>
-
-        <script src="/fg/js/display-frame.js"></script>
-    </body>
-</html>
diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/display-frame.js
deleted file mode 100644
index e3f3e692..00000000
--- a/ext/fg/js/display-frame.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016  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/>.
- */
-
-
-window.yomichan_frame = new class extends Display {
-    constructor() {
-        super($('#spinner'), $('#definitions'));
-        $(window).on('message', this.onMessage.bind(this));
-    }
-
-    onError(error) {
-        if (window.yomichan_orphaned) {
-            this.onOrphaned();
-        } else {
-            window.alert(`Error: ${error}`);
-        }
-    }
-
-    onOrphaned() {
-        $('#definitions').hide();
-        $('#error-orphaned').show();
-    }
-
-    onSearchClear() {
-        window.parent.postMessage('popupClose', '*');
-    }
-
-    onSelectionCopy() {
-        window.parent.postMessage('selectionCopy', '*');
-    }
-
-    onMessage(e) {
-        const handlers = {
-            termsShow: ({definitions, options, context}) => {
-                this.termsShow(definitions, options, context);
-            },
-
-            kanjiShow: ({definitions, options, context}) => {
-                this.kanjiShow(definitions, options, context);
-            },
-
-            orphaned: () => {
-                this.onOrphaned();
-            }
-        };
-
-        const {action, params} = e.originalEvent.data;
-        const handler = handlers[action];
-        if (handler) {
-            handler(params);
-        }
-    }
-
-    onKeyDown(e) {
-        const handlers = {
-            67: /* c */ () => {
-                if (e.ctrlKey && !window.getSelection().toString()) {
-                    this.onSelectionCopy();
-                    return true;
-                }
-            }
-        };
-
-        const handler = handlers[e.keyCode];
-        if (handler && handler()) {
-            e.preventDefault();
-        } else {
-            super.onKeyDown(e);
-        }
-    }
-};
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
new file mode 100644
index 00000000..59293239
--- /dev/null
+++ b/ext/fg/js/float.js
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016  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 DisplayFloat extends Display {
+    constructor() {
+        super($('#spinner'), $('#definitions'));
+        $(window).on('message', e => this.onMessage(e));
+    }
+
+    onError(error) {
+        if (window.yomichan_orphaned) {
+            this.onOrphaned();
+        } else {
+            window.alert(`Error: ${error}`);
+        }
+    }
+
+    onOrphaned() {
+        $('#definitions').hide();
+        $('#error-orphaned').show();
+    }
+
+    onSearchClear() {
+        window.parent.postMessage('popupClose', '*');
+    }
+
+    onSelectionCopy() {
+        window.parent.postMessage('selectionCopy', '*');
+    }
+
+    onMessage(e) {
+        const handlers = {
+            termsShow: ({definitions, options, context}) => {
+                this.termsShow(definitions, options, context);
+            },
+
+            kanjiShow: ({definitions, options, context}) => {
+                this.kanjiShow(definitions, options, context);
+            },
+
+            orphaned: () => {
+                this.onOrphaned();
+            }
+        };
+
+        const {action, params} = e.originalEvent.data;
+        const handler = handlers[action];
+        if (handler) {
+            handler(params);
+        }
+    }
+
+    onKeyDown(e) {
+        const handlers = {
+            67: /* c */ () => {
+                if (e.ctrlKey && !window.getSelection().toString()) {
+                    this.onSelectionCopy();
+                    return true;
+                }
+            }
+        };
+
+        const handler = handlers[e.keyCode];
+        if (handler && handler()) {
+            e.preventDefault();
+        } else {
+            super.onKeyDown(e);
+        }
+    }
+}
+
+window.yomichan_display = new DisplayFloat();
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index ba3289d4..8e61169a 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -20,10 +20,10 @@
 class Popup {
     constructor() {
         this.container = document.createElement('iframe');
-        this.container.id = 'yomichan-popup';
+        this.container.id = 'yomichan-float';
         this.container.addEventListener('mousedown', e => e.stopPropagation());
         this.container.addEventListener('scroll', e => e.stopPropagation());
-        this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html'));
+        this.container.setAttribute('src', chrome.extension.getURL('/fg/float.html'));
         this.container.style.width = '0px';
         this.container.style.height = '0px';
         this.injected = null;
diff --git a/ext/manifest.json b/ext/manifest.json
index ee3bd2ac..a8b68bfb 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -7,7 +7,7 @@
     "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
     "browser_action": {
         "default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"},
-        "default_popup": "bg/popup.html"
+        "default_popup": "bg/context.html"
     },
 
     "author": "Alex Yatskov",
@@ -20,7 +20,6 @@
             "fg/js/popup.js",
             "fg/js/source.js",
             "fg/js/util.js",
-
             "fg/js/frontend.js"
         ],
         "css": ["fg/css/client.css"]
@@ -48,7 +47,7 @@
             "description": "Open search window"
         }
     },
-    "web_accessible_resources": ["fg/frame.html"],
+    "web_accessible_resources": ["fg/float.html"],
     "applications": {
         "gecko": {
             "id": "yomichan-live@foosoft.net",
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
new file mode 100644
index 00000000..8b1819bd
--- /dev/null
+++ b/ext/mixed/css/display.css
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2016  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 entrys 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/>.
+ */
+
+
+/*
+ * Fonts
+ */
+
+@font-face {
+    font-family: kanji-stroke-orders;
+    src: url('/mixed/ttf/kanji-stroke-orders.ttf');
+}
+
+/*
+ * General
+ */
+
+hr {
+    padding: 0px;
+    margin: 0px;
+}
+
+#spinner {
+    bottom: 5px;
+    display: none;
+    position: fixed;
+    right: 5px;
+}
+
+#error-orphaned {
+    display: none;
+}
+
+
+/*
+ * Entries
+ */
+
+.entry, .note {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.tag-default {
+    background-color: #8a8a91;
+}
+
+.tag-name {
+    background-color: #5cb85c;
+}
+
+.tag-expression {
+    background-color: #f0ad4e;
+}
+
+.tag-popular {
+    background-color: #0275d8;
+}
+
+.tag-frequent {
+    background-color: #5bc0de;
+}
+
+.tag-archaism {
+    background-color: #d9534f;
+}
+
+.tag-dictionary {
+    background-color: #aa66cc;
+}
+
+.actions .disabled {
+    pointer-events: none;
+    cursor: default;
+}
+
+.actions .disabled img {
+    -webkit-filter: grayscale(100%);
+    opacity: 0.25;
+}
+
+.actions .pending {
+    visibility: hidden;
+}
+
+.actions {
+    display: inline-block;
+    float: right;
+}
+
+.actions:after {
+    clear: both;
+    content: '';
+    display: block;
+}
+
+.expression {
+    display: inline-block;
+    font-size: 24px;
+}
+
+.expression a {
+    border-bottom: 1px #777 dashed;
+    color: #333;
+    text-decoration: none;
+}
+
+.reasons {
+    color: #777;
+    display: inline-block;
+}
+
+.glossary ol, .glossary ul {
+    padding-left: 1.4em;
+}
+
+.glossary li {
+    color: #777;
+}
+
+.glossary-item {
+    color: #000;
+}
+
+.glyph {
+    font-family: kanji-stroke-orders;
+    font-size: 120px;
+    line-height: 120px;
+    padding: 0.01em;
+    vertical-align: top;
+}
diff --git a/ext/mixed/css/frame.css b/ext/mixed/css/frame.css
deleted file mode 100644
index 8b1819bd..00000000
--- a/ext/mixed/css/frame.css
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2016  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 entrys 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/>.
- */
-
-
-/*
- * Fonts
- */
-
-@font-face {
-    font-family: kanji-stroke-orders;
-    src: url('/mixed/ttf/kanji-stroke-orders.ttf');
-}
-
-/*
- * General
- */
-
-hr {
-    padding: 0px;
-    margin: 0px;
-}
-
-#spinner {
-    bottom: 5px;
-    display: none;
-    position: fixed;
-    right: 5px;
-}
-
-#error-orphaned {
-    display: none;
-}
-
-
-/*
- * Entries
- */
-
-.entry, .note {
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-
-.tag-default {
-    background-color: #8a8a91;
-}
-
-.tag-name {
-    background-color: #5cb85c;
-}
-
-.tag-expression {
-    background-color: #f0ad4e;
-}
-
-.tag-popular {
-    background-color: #0275d8;
-}
-
-.tag-frequent {
-    background-color: #5bc0de;
-}
-
-.tag-archaism {
-    background-color: #d9534f;
-}
-
-.tag-dictionary {
-    background-color: #aa66cc;
-}
-
-.actions .disabled {
-    pointer-events: none;
-    cursor: default;
-}
-
-.actions .disabled img {
-    -webkit-filter: grayscale(100%);
-    opacity: 0.25;
-}
-
-.actions .pending {
-    visibility: hidden;
-}
-
-.actions {
-    display: inline-block;
-    float: right;
-}
-
-.actions:after {
-    clear: both;
-    content: '';
-    display: block;
-}
-
-.expression {
-    display: inline-block;
-    font-size: 24px;
-}
-
-.expression a {
-    border-bottom: 1px #777 dashed;
-    color: #333;
-    text-decoration: none;
-}
-
-.reasons {
-    color: #777;
-    display: inline-block;
-}
-
-.glossary ol, .glossary ul {
-    padding-left: 1.4em;
-}
-
-.glossary li {
-    color: #777;
-}
-
-.glossary-item {
-    color: #000;
-}
-
-.glyph {
-    font-family: kanji-stroke-orders;
-    font-size: 120px;
-    line-height: 120px;
-    padding: 0.01em;
-    vertical-align: top;
-}
-- 
cgit v1.2.3


From bdf231082f4b4ca7c4c90d8b0cd40b6c4201723d Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 14 Aug 2017 21:43:09 -0700
Subject: lots of fixes to backend

---
 ext/bg/context.html      |  5 +----
 ext/bg/js/anki.js        |  9 +++++++++
 ext/bg/js/api.js         |  2 +-
 ext/bg/js/backend.js     | 20 +++++++++++++------
 ext/bg/js/context.js     |  4 ++--
 ext/bg/js/database.js    |  2 +-
 ext/bg/js/deinflector.js |  2 +-
 ext/bg/js/dictionary.js  |  2 +-
 ext/bg/js/handlebars.js  |  2 +-
 ext/bg/js/search.js      |  5 ++---
 ext/bg/js/settings.js    | 50 ++++++++++++++++++++++++------------------------
 ext/bg/js/util.js        |  7 ++++++-
 ext/bg/settings.html     |  3 +--
 ext/fg/js/api.js         | 22 ++++++++++++++-------
 ext/fg/js/frontend.js    |  2 +-
 ext/fg/js/popup.js       |  2 +-
 ext/mixed/js/display.js  |  9 +++++----
 17 files changed, 87 insertions(+), 61 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/context.html b/ext/bg/context.html
index 3828c9fe..8a72acc7 100644
--- a/ext/bg/context.html
+++ b/ext/bg/context.html
@@ -30,13 +30,10 @@
 
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
-        <script src="/mixed/lib/handlebars.min.js"></script>
 
         <script src="/bg/js/api.js"></script>
-        <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/options.js"></script>
-        <script src="/mixed/js/japanese.js"></script>
-        <script src="/mixed/js/request.js"></script>
+        <script src="/bg/js/util.js"></script>
 
         <script src="/bg/js/context.js"></script>
     </body>
diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
index f0ec4571..c327969f 100644
--- a/ext/bg/js/anki.js
+++ b/ext/bg/js/anki.js
@@ -17,6 +17,10 @@
  */
 
 
+/*
+ * AnkiConnect
+ */
+
 class AnkiConnect {
     constructor(server) {
         this.server = server;
@@ -68,6 +72,11 @@ class AnkiConnect {
     }
 }
 
+
+/*
+ * AnkiNull
+ */
+
 class AnkiNull {
     async addNote(note) {
         return null;
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 024ba75e..b55e306f 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index e8c9452c..97e5602a 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -77,7 +77,11 @@ class Backend {
 
         const handlers = {
             optionsGet: ({callback}) => {
-                forward(optionsLoad(), callback);
+                forward(apiOptionsGet(), callback);
+            },
+
+            optionsSet: ({options, callback}) => {
+                forward(apiOptionsSet(options), callback);
             },
 
             kanjiFind: ({text, callback}) => {
@@ -88,10 +92,6 @@ class Backend {
                 forward(apiTermsFind(text), callback);
             },
 
-            templateRender: ({template, data, callback}) => {
-                forward(apiTemplateRender(template, data), callback);
-            },
-
             definitionAdd: ({definition, mode, callback}) => {
                 forward(apiDefinitionAdd(definition, mode), callback);
             },
@@ -102,6 +102,14 @@ class Backend {
 
             noteView: ({noteId}) => {
                 forward(apiNoteView(noteId), callback);
+            },
+
+            templateRender: ({template, data, callback}) => {
+                forward(apiTemplateRender(template, data), callback);
+            },
+
+            commandExec: ({command, callback}) => {
+                forward(apiCommandExec(command), callback);
             }
         };
 
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
index 77cb5166..689d6863 100644
--- a/ext/bg/js/context.js
+++ b/ext/bg/js/context.js
@@ -17,7 +17,7 @@
  */
 
 
-$(document).ready(() => {
+$(document).ready(utilAsync(() => {
     $('#open-search').click(() => apiCommandExec('search'));
     $('#open-options').click(() => apiCommandExec('options'));
     $('#open-help').click(() => apiCommandExec('help'));
@@ -28,4 +28,4 @@ $(document).ready(() => {
         toggle.bootstrapToggle();
         toggle.change(() => apiCommandExec('toggle'));
     });
-});
+}));
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index b38e00db..e00cb7a3 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index 8b67761b..0abde99d 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 6f9b30e4..c8d431b9 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
index df98bef1..debb0690 100644
--- a/ext/bg/js/handlebars.js
+++ b/ext/bg/js/handlebars.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 87f50c32..54cda8ec 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -41,9 +41,8 @@ class DisplaySearch extends Display {
     }
 
     async onSearch(e) {
-        e.preventDefault();
-
         try {
+            e.preventDefault();
             this.intro.slideUp();
             const {length, definitions} = await apiTermsFind(this.query.val());
             super.termsShow(definitions, await apiOptionsGet());
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index ce9e14a2..89b1581f 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -90,12 +90,12 @@ function formUpdateVisibility(options) {
     }
 }
 
-async function onFormOptionsChanged(e) {(async () => {
-    if (!e.originalEvent && !e.isTrigger) {
-        return;
-    }
-
+async function onFormOptionsChanged(e) {
     try {
+        if (!e.originalEvent && !e.isTrigger) {
+            return;
+        }
+
         ankiErrorShow();
         ankiSpinnerShow(true);
 
@@ -116,9 +116,9 @@ async function onFormOptionsChanged(e) {(async () => {
     } finally {
         ankiSpinnerShow(false);
     }
-})();}
+}
 
-function onReady() {(async () => {
+async function onReady() {
     const options = await optionsLoad();
 
     $('#show-usage-guide').prop('checked', options.general.showGuide);
@@ -139,16 +139,16 @@ function onReady() {(async () => {
     $('#scan-length').val(options.scanning.length);
     $('#scan-modifier-key').val(options.scanning.modifier);
 
-    $('#dict-purge').click(onDictionaryPurge);
-    $('#dict-file').change(onDictionaryImport);
+    $('#dict-purge').click(utilAsync(onDictionaryPurge));
+    $('#dict-file').change(utilAsync(onDictionaryImport));
 
     $('#anki-enable').prop('checked', options.anki.enable);
     $('#card-tags').val(options.anki.tags.join(' '));
     $('#generate-html-cards').prop('checked', options.anki.htmlCards);
     $('#sentence-detection-extent').val(options.anki.sentenceExt);
     $('#interface-server').val(options.anki.server);
-    $('input, select').not('.anki-model').change(onFormOptionsChanged);
-    $('.anki-model').change(onAnkiModelChanged);
+    $('input, select').not('.anki-model').change(utilAsync(onFormOptionsChanged));
+    $('.anki-model').change(utilAsync(onAnkiModelChanged));
 
     try {
         await dictionaryGroupsPopulate(options);
@@ -163,9 +163,9 @@ function onReady() {(async () => {
     }
 
     formUpdateVisibility(options);
-})();}
+}
 
-$(document).ready(onReady);
+$(document).ready(utilAsync(onReady));
 
 
 /*
@@ -237,7 +237,7 @@ async function dictionaryGroupsPopulate(options) {
     });
 }
 
-async function onDictionaryPurge(e) {(async () => {
+async function onDictionaryPurge(e) {
     e.preventDefault();
 
     const dictControls = $('#dict-importer, #dict-groups').hide();
@@ -261,9 +261,9 @@ async function onDictionaryPurge(e) {(async () => {
         dictControls.show();
         dictProgress.hide();
     }
-})();}
+}
 
-function onDictionaryImport(e) {(async () => {
+async function onDictionaryImport(e) {
     const dictFile = $('#dict-file');
     const dictControls = $('#dict-importer').hide();
     const dictProgress = $('#dict-import-progress').show();
@@ -291,7 +291,7 @@ function onDictionaryImport(e) {(async () => {
         dictControls.show();
         dictProgress.hide();
     }
-})();}
+}
 
 
 /*
@@ -398,7 +398,7 @@ async function ankiFieldsPopulate(element, options) {
         container.append($(html));
     }
 
-    tab.find('.anki-field-value').change(onFormOptionsChanged);
+    tab.find('.anki-field-value').change(utilAsync(onFormOptionsChanged));
     tab.find('.marker-link').click(onAnkiMarkerClicked);
 }
 
@@ -408,12 +408,12 @@ function onAnkiMarkerClicked(e) {
     $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
 }
 
-function onAnkiModelChanged(e) {(async () => {
-    if (!e.originalEvent) {
-        return;
-    }
-
+async function onAnkiModelChanged(e) {
     try {
+        if (!e.originalEvent) {
+            return;
+        }
+
         ankiErrorShow();
         ankiSpinnerShow(true);
 
@@ -431,4 +431,4 @@ function onAnkiModelChanged(e) {(async () => {
     } finally {
         ankiSpinnerShow(false);
     }
-})();}
+}
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 9dc57950..11ec23eb 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -16,6 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+function utilAsync(func) {
+    return function(...args) {
+        func.apply(this, args);
+    };
+}
 
 function utilBackend() {
     return chrome.extension.getBackgroundPage().yomichan_backend;
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 719c67a2..237750b3 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -276,8 +276,7 @@
         <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
 
-        <script src="/bg/js/anki-connect.js"></script>
-        <script src="/bg/js/anki-null.js"></script>
+        <script src="/bg/js/anki.js"></script>
         <script src="/bg/js/api.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js
index b4d75c3c..174531ba 100644
--- a/ext/fg/js/api.js
+++ b/ext/fg/js/api.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,10 @@
  */
 
 
+function apiOptionsSet(options) {
+    return utilInvoke('optionsSet', {options});
+}
+
 function apiOptionsGet() {
     return utilInvoke('optionsGet');
 }
@@ -29,18 +33,22 @@ function apiKanjiFind(text) {
     return utilInvoke('kanjiFind', {text});
 }
 
-function apiTemplateRender(template, data) {
-    return utilInvoke('templateRender', {data, template});
+function apiDefinitionAdd(definition, mode) {
+    return utilInvoke('definitionAdd', {definition, mode});
 }
 
 function apiDefinitionsAddable(definitions, modes) {
     return utilInvoke('definitionsAddable', {definitions, modes}).catch(() => null);
 }
 
-function apiDefinitionAdd(definition, mode) {
-    return utilInvoke('definitionAdd', {definition, mode});
-}
-
 function apiNoteView(noteId) {
     return utilInvoke('noteView', {noteId});
 }
+
+function apiTemplateRender(template, data) {
+    return utilInvoke('templateRender', {data, template});
+}
+
+function apiCommandExec(command) {
+    return utilInvoke('commandExec', {command});
+}
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 005139e6..cc4d99c8 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -230,7 +230,7 @@ class Frontend {
 
         const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
         const url = window.location.href;
-        this.popup.showKanji(
+        this.popup.kanjiShow(
             textSource.getRect(),
             definitions,
             this.options,
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 8e61169a..8cb16b5a 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -102,7 +102,7 @@ class Popup {
 
     async kanjiShow(elementRect, definitions, options, context) {
         await this.show(elementRect, options);
-        this.invokeApi('termsShow', {definitions, options, context});
+        this.invokeApi('kanjiShow', {definitions, options, context});
     }
 
     invokeApi(action, params={}) {
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 97dd7d5c..21748f5d 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -42,7 +42,7 @@ class Display {
 
     onSourceTermView(e) {
         e.preventDefault();
-        this.sourceBack();
+        this.sourceTermView();
     }
 
     async onKanjiLookup(e) {
@@ -154,7 +154,7 @@ class Display {
 
             66: /* b */ () => {
                 if (e.altKey) {
-                    this.sourceBack();
+                    this.sourceTermView();
                     return true;
                 }
             },
@@ -276,6 +276,7 @@ class Display {
             this.entryScrollIntoView(context && context.index || 0);
 
             $('.action-add-note').click(this.onNoteAdd.bind(this));
+            $('.action-view-note').click(this.onNoteView.bind(this));
             $('.source-term').click(this.onSourceTermView.bind(this));
 
             await this.adderButtonUpdate(['kanji'], sequence);
@@ -288,7 +289,7 @@ class Display {
         try {
             this.spinner.show();
 
-            const states = apiDefinitionsAddable(this.definitions, modes);
+            const states = await apiDefinitionsAddable(this.definitions, modes);
             if (!states || sequence !== this.sequence) {
                 return;
             }
@@ -332,7 +333,7 @@ class Display {
         this.index = index;
     }
 
-    sourceBack() {
+    sourceTermView() {
         if (this.context && this.context.source) {
             const context = {
                 url: this.context.source.url,
-- 
cgit v1.2.3


From c9623276e1dfdf6014d2bf791180e88e8df500dd Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 14 Aug 2017 22:58:03 -0700
Subject: change color for "off" state, fixes #67

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

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 97e5602a..6c77ba7e 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -40,7 +40,7 @@ class Backend {
         this.options = options;
 
         if (!options.general.enable) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
+            chrome.browserAction.setBadgeBackgroundColor({color: '#555555'});
             chrome.browserAction.setBadgeText({text: 'off'});
         } else if (!dictConfigured(options)) {
             chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
-- 
cgit v1.2.3


From e079e5f252ee39b222f3eb78e81d0a6bab6626d2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 15 Aug 2017 20:58:50 -0700
Subject: fix loss of anki settings

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

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 89b1581f..7bdd9f84 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -96,9 +96,6 @@ async function onFormOptionsChanged(e) {
             return;
         }
 
-        ankiErrorShow();
-        ankiSpinnerShow(true);
-
         const {optionsNew, optionsOld} = await formRead();
         await optionsSave(optionsNew);
 
@@ -109,7 +106,9 @@ async function onFormOptionsChanged(e) {
             optionsNew.anki.server !== optionsOld.anki.server;
 
         if (ankiUpdated) {
+            ankiSpinnerShow(true);
             await ankiDeckAndModelPopulate(optionsNew);
+            ankiErrorShow();
         }
     } catch (e) {
         ankiErrorShow(e);
@@ -414,9 +413,6 @@ async function onAnkiModelChanged(e) {
             return;
         }
 
-        ankiErrorShow();
-        ankiSpinnerShow(true);
-
         const element = $(this);
         const tab = element.closest('.tab-pane');
         const tabId = tab.attr('id');
@@ -425,7 +421,9 @@ async function onAnkiModelChanged(e) {
         optionsNew.anki[tabId].fields = {};
         await optionsSave(optionsNew);
 
+        ankiSpinnerShow(true);
         await ankiFieldsPopulate(element, optionsNew);
+        ankiErrorShow();
     } catch (e) {
         ankiErrorShow(e);
     } finally {
-- 
cgit v1.2.3


From e19933f9804abf4e64d96143bbb58f8059de5b38 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 15 Aug 2017 21:36:30 -0700
Subject: jisho.org audio support

---
 ext/bg/js/api.js        |  3 +++
 ext/bg/js/backend.js    |  4 ++++
 ext/bg/settings.html    |  1 +
 ext/fg/js/api.js        |  4 ++++
 ext/mixed/js/audio.js   | 30 +++++++++++++++++++++++++++++-
 ext/mixed/js/display.js |  3 +--
 6 files changed, 42 insertions(+), 3 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index b55e306f..8b4c3896 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -127,3 +127,6 @@ async function apiCommandExec(command) {
     }
 }
 
+async function apiAudioGetUrl(definition, source) {
+    return audioBuildUrl(definition, source);
+}
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 6c77ba7e..9602d385 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -110,6 +110,10 @@ class Backend {
 
             commandExec: ({command, callback}) => {
                 forward(apiCommandExec(command), callback);
+            },
+
+            audioGetUrl: ({definition, source, callback}) => {
+                forward(apiAudioGetUrl(definition, source), callback);
             }
         };
 
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 218f9f7d..ba155d4a 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -48,6 +48,7 @@
                         <option value="disabled">Disabled</option>
                         <option value="jpod101">JapanesePod101</option>
                         <option value="jpod101-alternate">JapanesePod101 (alternate)</option>
+                        <option value="jisho">Jisho</option>
                     </select>
                 </div>
 
diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js
index 174531ba..151882eb 100644
--- a/ext/fg/js/api.js
+++ b/ext/fg/js/api.js
@@ -52,3 +52,7 @@ function apiTemplateRender(template, data) {
 function apiCommandExec(command) {
     return utilInvoke('commandExec', {command});
 }
+
+function apiAudioGetUrl(definition, source) {
+    return utilInvoke('audioGetUrl', {definition, source});
+}
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
index eb8fde94..0952887e 100644
--- a/ext/mixed/js/audio.js
+++ b/ext/mixed/js/audio.js
@@ -79,7 +79,35 @@ async function audioBuildUrl(definition, mode, cache={}) {
                 }
             }
         });
-    } else {
+    } else if (mode === 'jisho') {
+        return new Promise((resolve, reject) => {
+            const response = cache[definition.expression];
+            if (response) {
+                resolve(response);
+            } else {
+                const xhr = new XMLHttpRequest();
+                xhr.open('GET', `http://jisho.org/search/${definition.expression}`);
+                xhr.addEventListener('error', () => reject('failed to scrape audio data'));
+                xhr.addEventListener('load', () => {
+                    cache[definition.expression] = xhr.responseText;
+                    resolve(xhr.responseText);
+                });
+
+                xhr.send();
+            }
+        }).then(response => {
+            try {
+                const dom = new DOMParser().parseFromString(response, 'text/html');
+                const audio = dom.getElementById(`audio_${definition.expression}:${definition.reading}`);
+                if (audio) {
+                    return audio.getElementsByTagName('source').item(0).getAttribute('src');
+                }
+            } catch (e) {
+                // NOP
+            }
+        });
+    }
+    else {
         return Promise.resolve();
     }
 }
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 21748f5d..12950dfd 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -27,7 +27,6 @@ class Display {
         this.sequence = 0;
         this.index = 0;
         this.audioCache = {};
-        this.responseCache = {};
 
         $(document).keydown(this.onKeyDown.bind(this));
     }
@@ -368,7 +367,7 @@ class Display {
         try {
             this.spinner.show();
 
-            let url = await audioBuildUrl(definition, this.options.general.audioSource, this.responseCache);
+            let url = await apiAudioGetUrl(definition, this.options.general.audioSource);
             if (!url) {
                 url = '/mixed/mp3/button.mp3';
             }
-- 
cgit v1.2.3


From 8ed3ca6fd44d24aff9ea41c65821c6e094024d4e Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 15 Aug 2017 21:40:41 -0700
Subject: cleanup

---
 ext/bg/background.html  |   4 +-
 ext/bg/js/audio.js      | 154 ++++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/request.js    |  40 +++++++++++++
 ext/bg/search.html      |   2 +-
 ext/bg/settings.html    |   2 +-
 ext/fg/float.html       |   1 -
 ext/mixed/js/audio.js   | 154 ------------------------------------------------
 ext/mixed/js/request.js |  40 -------------
 8 files changed, 198 insertions(+), 199 deletions(-)
 create mode 100644 ext/bg/js/audio.js
 create mode 100644 ext/bg/js/request.js
 delete mode 100644 ext/mixed/js/audio.js
 delete mode 100644 ext/mixed/js/request.js

(limited to 'ext/bg/js')

diff --git a/ext/bg/background.html b/ext/bg/background.html
index 90ad9709..97b20f46 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -11,17 +11,17 @@
 
         <script src="/bg/js/anki.js"></script>
         <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/audio.js"></script>
         <script src="/bg/js/database.js"></script>
         <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/options.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>
         <script src="/mixed/js/japanese.js"></script>
-        <script src="/mixed/js/request.js"></script>
 
         <script src="/bg/js/backend.js"></script>
     </body>
diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js
new file mode 100644
index 00000000..0952887e
--- /dev/null
+++ b/ext/bg/js/audio.js
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2017  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/>.
+ */
+
+
+async function audioBuildUrl(definition, mode, cache={}) {
+    if (mode === 'jpod101') {
+        let kana = definition.reading;
+        let kanji = definition.expression;
+
+        if (!kana && wanakana.isHiragana(kanji)) {
+            kana = kanji;
+            kanji = null;
+        }
+
+        const params = [];
+        if (kanji) {
+            params.push(`kanji=${encodeURIComponent(kanji)}`);
+        }
+        if (kana) {
+            params.push(`kana=${encodeURIComponent(kana)}`);
+        }
+
+        const url = `https://assets.languagepod101.com/dictionary/japanese/audiomp3.php?${params.join('&')}`;
+        return Promise.resolve(url);
+    } else if (mode === 'jpod101-alternate') {
+        return new Promise((resolve, reject) => {
+            const response = cache[definition.expression];
+            if (response) {
+                resolve(response);
+            } else {
+                const data = {
+                    post: 'dictionary_reference',
+                    match_type: 'exact',
+                    search_query: definition.expression
+                };
+
+                const params = [];
+                for (const key in data) {
+                    params.push(`${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`);
+                }
+
+                const xhr = new XMLHttpRequest();
+                xhr.open('POST', 'https://www.japanesepod101.com/learningcenter/reference/dictionary_post');
+                xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+                xhr.addEventListener('error', () => reject('failed to scrape audio data'));
+                xhr.addEventListener('load', () => {
+                    cache[definition.expression] = xhr.responseText;
+                    resolve(xhr.responseText);
+                });
+
+                xhr.send(params.join('&'));
+            }
+        }).then(response => {
+            const dom = new DOMParser().parseFromString(response, 'text/html');
+            for (const row of dom.getElementsByClassName('dc-result-row')) {
+                try {
+                    const url = row.getElementsByClassName('ill-onebuttonplayer').item(0).getAttribute('data-url');
+                    const reading = row.getElementsByClassName('dc-vocab_kana').item(0).innerText;
+                    if (url && reading && (!definition.reading || definition.reading === reading)) {
+                        return url;
+                    }
+                } catch (e) {
+                    // NOP
+                }
+            }
+        });
+    } else if (mode === 'jisho') {
+        return new Promise((resolve, reject) => {
+            const response = cache[definition.expression];
+            if (response) {
+                resolve(response);
+            } else {
+                const xhr = new XMLHttpRequest();
+                xhr.open('GET', `http://jisho.org/search/${definition.expression}`);
+                xhr.addEventListener('error', () => reject('failed to scrape audio data'));
+                xhr.addEventListener('load', () => {
+                    cache[definition.expression] = xhr.responseText;
+                    resolve(xhr.responseText);
+                });
+
+                xhr.send();
+            }
+        }).then(response => {
+            try {
+                const dom = new DOMParser().parseFromString(response, 'text/html');
+                const audio = dom.getElementById(`audio_${definition.expression}:${definition.reading}`);
+                if (audio) {
+                    return audio.getElementsByTagName('source').item(0).getAttribute('src');
+                }
+            } catch (e) {
+                // NOP
+            }
+        });
+    }
+    else {
+        return Promise.resolve();
+    }
+}
+
+function audioBuildFilename(definition) {
+    if (definition.reading || definition.expression) {
+        let filename = 'yomichan';
+        if (definition.reading) {
+            filename += `_${definition.reading}`;
+        }
+        if (definition.expression) {
+            filename += `_${definition.expression}`;
+        }
+
+        return filename += '.mp3';
+    }
+}
+
+async function audioInject(definition, fields, mode) {
+    let usesAudio = false;
+    for (const name in fields) {
+        if (fields[name].includes('{audio}')) {
+            usesAudio = true;
+            break;
+        }
+    }
+
+    if (!usesAudio) {
+        return true;
+    }
+
+    try {
+        const url = await audioBuildUrl(definition, mode);
+        const filename = audioBuildFilename(definition);
+
+        if (url && filename) {
+            definition.audio = {url, filename};
+        }
+
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
diff --git a/ext/bg/js/request.js b/ext/bg/js/request.js
new file mode 100644
index 00000000..94fd135a
--- /dev/null
+++ b/ext/bg/js/request.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017  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/>.
+ */
+
+
+function requestJson(url, action, params) {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.overrideMimeType('application/json');
+        xhr.addEventListener('load', () => resolve(xhr.responseText));
+        xhr.addEventListener('error', () => reject('failed to execute network request'));
+        xhr.open(action, url);
+        if (params) {
+            xhr.send(JSON.stringify(params));
+        } else {
+            xhr.send();
+        }
+    }).then(responseText => {
+        try {
+            return JSON.parse(responseText);
+        }
+        catch (e) {
+            return Promise.reject('invalid JSON response');
+        }
+    });
+}
diff --git a/ext/bg/search.html b/ext/bg/search.html
index d10530f9..5fbd467a 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -37,11 +37,11 @@
         <script src="/mixed/lib/wanakana.min.js"></script>
 
         <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/audio.js"></script>
         <script src="/bg/js/dictionary.js"></script>
         <script src="/bg/js/handlebars.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
-        <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
         <script src="/mixed/js/japanese.js"></script>
 
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index ba155d4a..8798aeb1 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -48,7 +48,7 @@
                         <option value="disabled">Disabled</option>
                         <option value="jpod101">JapanesePod101</option>
                         <option value="jpod101-alternate">JapanesePod101 (alternate)</option>
-                        <option value="jisho">Jisho</option>
+                        <option value="jisho">Jisho.org</option>
                     </select>
                 </div>
 
diff --git a/ext/fg/float.html b/ext/fg/float.html
index a3b66c92..89872cce 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -35,7 +35,6 @@
 
         <script src="/fg/js/api.js"></script>
         <script src="/fg/js/util.js"></script>
-        <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display.js"></script>
 
         <script src="/fg/js/float.js"></script>
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js
deleted file mode 100644
index 0952887e..00000000
--- a/ext/mixed/js/audio.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2017  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/>.
- */
-
-
-async function audioBuildUrl(definition, mode, cache={}) {
-    if (mode === 'jpod101') {
-        let kana = definition.reading;
-        let kanji = definition.expression;
-
-        if (!kana && wanakana.isHiragana(kanji)) {
-            kana = kanji;
-            kanji = null;
-        }
-
-        const params = [];
-        if (kanji) {
-            params.push(`kanji=${encodeURIComponent(kanji)}`);
-        }
-        if (kana) {
-            params.push(`kana=${encodeURIComponent(kana)}`);
-        }
-
-        const url = `https://assets.languagepod101.com/dictionary/japanese/audiomp3.php?${params.join('&')}`;
-        return Promise.resolve(url);
-    } else if (mode === 'jpod101-alternate') {
-        return new Promise((resolve, reject) => {
-            const response = cache[definition.expression];
-            if (response) {
-                resolve(response);
-            } else {
-                const data = {
-                    post: 'dictionary_reference',
-                    match_type: 'exact',
-                    search_query: definition.expression
-                };
-
-                const params = [];
-                for (const key in data) {
-                    params.push(`${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`);
-                }
-
-                const xhr = new XMLHttpRequest();
-                xhr.open('POST', 'https://www.japanesepod101.com/learningcenter/reference/dictionary_post');
-                xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-                xhr.addEventListener('error', () => reject('failed to scrape audio data'));
-                xhr.addEventListener('load', () => {
-                    cache[definition.expression] = xhr.responseText;
-                    resolve(xhr.responseText);
-                });
-
-                xhr.send(params.join('&'));
-            }
-        }).then(response => {
-            const dom = new DOMParser().parseFromString(response, 'text/html');
-            for (const row of dom.getElementsByClassName('dc-result-row')) {
-                try {
-                    const url = row.getElementsByClassName('ill-onebuttonplayer').item(0).getAttribute('data-url');
-                    const reading = row.getElementsByClassName('dc-vocab_kana').item(0).innerText;
-                    if (url && reading && (!definition.reading || definition.reading === reading)) {
-                        return url;
-                    }
-                } catch (e) {
-                    // NOP
-                }
-            }
-        });
-    } else if (mode === 'jisho') {
-        return new Promise((resolve, reject) => {
-            const response = cache[definition.expression];
-            if (response) {
-                resolve(response);
-            } else {
-                const xhr = new XMLHttpRequest();
-                xhr.open('GET', `http://jisho.org/search/${definition.expression}`);
-                xhr.addEventListener('error', () => reject('failed to scrape audio data'));
-                xhr.addEventListener('load', () => {
-                    cache[definition.expression] = xhr.responseText;
-                    resolve(xhr.responseText);
-                });
-
-                xhr.send();
-            }
-        }).then(response => {
-            try {
-                const dom = new DOMParser().parseFromString(response, 'text/html');
-                const audio = dom.getElementById(`audio_${definition.expression}:${definition.reading}`);
-                if (audio) {
-                    return audio.getElementsByTagName('source').item(0).getAttribute('src');
-                }
-            } catch (e) {
-                // NOP
-            }
-        });
-    }
-    else {
-        return Promise.resolve();
-    }
-}
-
-function audioBuildFilename(definition) {
-    if (definition.reading || definition.expression) {
-        let filename = 'yomichan';
-        if (definition.reading) {
-            filename += `_${definition.reading}`;
-        }
-        if (definition.expression) {
-            filename += `_${definition.expression}`;
-        }
-
-        return filename += '.mp3';
-    }
-}
-
-async function audioInject(definition, fields, mode) {
-    let usesAudio = false;
-    for (const name in fields) {
-        if (fields[name].includes('{audio}')) {
-            usesAudio = true;
-            break;
-        }
-    }
-
-    if (!usesAudio) {
-        return true;
-    }
-
-    try {
-        const url = await audioBuildUrl(definition, mode);
-        const filename = audioBuildFilename(definition);
-
-        if (url && filename) {
-            definition.audio = {url, filename};
-        }
-
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
diff --git a/ext/mixed/js/request.js b/ext/mixed/js/request.js
deleted file mode 100644
index 94fd135a..00000000
--- a/ext/mixed/js/request.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017  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/>.
- */
-
-
-function requestJson(url, action, params) {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.overrideMimeType('application/json');
-        xhr.addEventListener('load', () => resolve(xhr.responseText));
-        xhr.addEventListener('error', () => reject('failed to execute network request'));
-        xhr.open(action, url);
-        if (params) {
-            xhr.send(JSON.stringify(params));
-        } else {
-            xhr.send();
-        }
-    }).then(responseText => {
-        try {
-            return JSON.parse(responseText);
-        }
-        catch (e) {
-            return Promise.reject('invalid JSON response');
-        }
-    });
-}
-- 
cgit v1.2.3


From 84d2204d966342fa03635b4b8a860bb48a418bc0 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 15 Aug 2017 21:51:48 -0700
Subject: firefox fixes

---
 ext/bg/js/api.js  | 8 ++------
 ext/bg/js/util.js | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 8b4c3896..4b6729ad 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -18,15 +18,11 @@
 
 
 async function apiOptionsSet(options) {
-    // In Firefox, setting options from the options UI somehow carries references
-    // to the DOM across to the background page, causing the options object to
-    // become a "DeadObject" after the options page is closed. The workaround used
-    // here is to create a deep copy of the options object.
-    utilBackend().onOptionsUpdated(JSON.parse(JSON.stringify(options)));
+    utilBackend().onOptionsUpdated(utilIsolate(options));
 }
 
 async function apiOptionsGet() {
-    return utilBackend().options;
+    return utilIsolate(utilBackend().options);
 }
 
 async function apiTermsFind(text) {
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 11ec23eb..a92fd0bc 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -22,6 +22,10 @@ function utilAsync(func) {
     };
 }
 
+function utilIsolate(data) {
+    return JSON.parse(JSON.stringify(data));
+}
+
 function utilBackend() {
     return chrome.extension.getBackgroundPage().yomichan_backend;
 }
-- 
cgit v1.2.3


From 6367894df0ea54cd6079abd93e9e1f261482185a Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 17 Aug 2017 19:11:23 -0700
Subject: fixing broken firefox object behavior

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

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 4b6729ad..2afe82a0 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -18,11 +18,11 @@
 
 
 async function apiOptionsSet(options) {
-    utilBackend().onOptionsUpdated(utilIsolate(options));
+    utilBackend().onOptionsUpdated(options);
 }
 
 async function apiOptionsGet() {
-    return utilIsolate(utilBackend().options);
+    return utilBackend().options;
 }
 
 async function apiTermsFind(text) {
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 9602d385..6b3acaa9 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -37,7 +37,7 @@ class Backend {
     }
 
     onOptionsUpdated(options) {
-        this.options = options;
+        this.options = utilIsolate(options);
 
         if (!options.general.enable) {
             chrome.browserAction.setBadgeBackgroundColor({color: '#555555'});
-- 
cgit v1.2.3