From b24c70523479c16eca848f5aafaa887549689ac6 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Fri, 29 Sep 2017 05:41:29 +0300
Subject: basic structure for feature-merge-similar-results

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

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index a2f22371..c5a28a45 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -22,9 +22,9 @@ async function formRead() {
     const optionsNew = $.extend(true, {}, optionsOld);
 
     optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
+    optionsNew.general.resultOutputMode = $('#result-output-mode').val();
     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);
@@ -124,9 +124,9 @@ async function onReady() {
     const options = await optionsLoad();
 
     $('#show-usage-guide').prop('checked', options.general.showGuide);
+    $('#result-output-mode').val(options.general.resultOutputMode);
     $('#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);
-- 
cgit v1.2.3


From cfad3b309976213c45f99bef3b8fad072c6bb9ec Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 5 Oct 2017 05:21:07 +0300
Subject: merged mode: add main dictionary selection

---
 ext/bg/js/database.js   | 27 ++++++++++++++-------------
 ext/bg/js/dictionary.js |  4 ++--
 ext/bg/js/options.js    |  4 ++++
 ext/bg/js/settings.js   | 30 ++++++++++++++++++++++++++----
 ext/bg/js/templates.js  |  4 +++-
 ext/bg/js/translator.js |  5 +++--
 tmpl/dictionary.html    |  1 +
 7 files changed, 53 insertions(+), 22 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 0de0505d..7a893fc0 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -85,25 +85,26 @@ class Database {
         return results;
     }
 
-    async findTermsBySequence(sequence, dictionary) {
+    async findTermsBySequence(sequence, mainDictionary) {
         if (!this.db) {
             throw 'Database not initialized';
         }
 
         const results = [];
         await this.db.terms.where('sequence').equals(sequence).each(row => {
-            // if (dictionary === row.dictionary) {
-            results.push({
-                expression: row.expression,
-                reading: row.reading,
-                tags: dictFieldSplit(row.tags),
-                rules: dictFieldSplit(row.rules),
-                glossary: row.glossary,
-                score: row.score,
-                dictionary: row.dictionary,
-                id: row.id,
-                sequence: typeof row.sequence === 'undefined' ? -1 : row.sequence
-            });
+            if (row.dictionary === mainDictionary) {
+                results.push({
+                    expression: row.expression,
+                    reading: row.reading,
+                    tags: dictFieldSplit(row.tags),
+                    rules: dictFieldSplit(row.rules),
+                    glossary: row.glossary,
+                    score: row.score,
+                    dictionary: row.dictionary,
+                    id: row.id,
+                    sequence: typeof row.sequence === 'undefined' ? -1 : row.sequence
+                });
+            }
         });
 
         return results;
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 2b289a23..c20df400 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -144,10 +144,10 @@ function dictTermsGroup(definitions, dictionaries) {
     return dictTermsSort(results);
 }
 
-function dictTermsMergeBySequence(definitions) {
+function dictTermsMergeBySequence(definitions, mainDictionary) {
     const definitionsBySequence = {'-1': []};
     for (const definition of definitions) {
-        if (definition.sequence > 0) {
+        if (mainDictionary === definition.dictionary && definition.sequence > 0) {
             if (!definitionsBySequence[definition.sequence]) {
                 definitionsBySequence[definition.sequence] = {
                     reasons: definition.reasons,
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index b49c32da..0aa6d7c6 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -154,6 +154,10 @@ function optionsSetDefaults(options) {
 
         dictionaries: {},
 
+        dictionary: {
+            main: ''
+        },
+
         anki: {
             enable: false,
             server: 'http://127.0.0.1:8765',
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index c5a28a45..4d248304 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -60,7 +60,11 @@ async function formRead() {
         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};
+        const main = dictionary.find('.dict-main').prop('checked');
+        if (main) {
+            optionsNew.dictionary.main = title;
+        }
+        optionsNew.dictionaries[title] = {priority, enabled, main};
     });
 
     return {optionsNew, optionsOld};
@@ -237,6 +241,18 @@ function dictionaryGroupsSort() {
     dictGroups.append(dictGroupChildren);
 }
 
+function dictionarySetMain(e) {
+    const mainDictionary = $(e.target).closest('.dict-group');
+    const mainDictionaryTitle = mainDictionary.data('title');
+
+    $('.dict-group').each((index, element) => {
+        const dictionary = $(element);
+        if (dictionary.data('title') !== mainDictionaryTitle) {
+            dictionary.find('.dict-main').prop('checked', false);
+        }
+    });
+}
+
 async function dictionaryGroupsPopulate(options) {
     const dictGroups = $('#dict-groups').empty();
     const dictWarning = $('#dict-warning').hide();
@@ -247,13 +263,14 @@ async function dictionaryGroupsPopulate(options) {
     }
 
     for (const dictRow of dictRowsSort(dictRows, options)) {
-        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0};
+        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0, main: false};
         const dictHtml = await apiTemplateRender('dictionary.html', {
             title: dictRow.title,
             version: dictRow.version,
             revision: dictRow.revision,
             priority: dictOptions.priority,
-            enabled: dictOptions.enabled
+            enabled: dictOptions.enabled,
+            main: dictOptions.main
         });
 
         dictGroups.append($(dictHtml));
@@ -265,6 +282,11 @@ async function dictionaryGroupsPopulate(options) {
         dictionaryGroupsSort();
         onFormOptionsChanged(e);
     });
+
+    $('.dict-main').change(e => {
+        dictionarySetMain(e);
+        onFormOptionsChanged(e);
+    });
 }
 
 async function onDictionaryPurge(e) {
@@ -308,7 +330,7 @@ async function onDictionaryImport(e) {
 
         const options = await optionsLoad();
         const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
-        options.dictionaries[summary.title] = {enabled: true, priority: 0};
+        options.dictionaries[summary.title] = {enabled: true, priority: 0, main: false};
         await optionsSave(options);
 
         await dictionaryGroupsPopulate(options);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index c6de8580..4341322a 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,9 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.revision || (depth0 != null ? depth0.revision : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"revision","hash":{},"data":data}) : helper)))
     + "</small></h4>\n\n    <div class=\"checkbox\">\n        <label><input type=\"checkbox\" class=\"dict-enabled\" "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enabled : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Enable search</label>\n    </div>\n    <div class=\"form-group options-advanced\">\n        <label for=\"dict-"
+    + "> Enable search</label>\n        <label><input type=\"radio\" class=\"dict-main\" "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.main : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "> Set as main dictionary</label>\n    </div>\n    <div class=\"form-group options-advanced\">\n        <label for=\"dict-"
     + 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)))
     + "\">Result priority</label>\n        <input type=\"number\" value=\""
     + alias4(((helper = (helper = helpers.priority || (depth0 != null ? depth0.priority : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"priority","hash":{},"data":data}) : helper)))
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 81253374..3442124f 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -49,10 +49,11 @@ class Translator {
     }
 
     async findTermsMerged(text, dictionaries, alphanumeric) {
+        const options = await apiOptionsGet();
         const titles = Object.keys(dictionaries);
         const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
 
-        const definitionsBySequence = dictTermsMergeBySequence(definitions);
+        const definitionsBySequence = dictTermsMergeBySequence(definitions, options.dictionary.main);
 
         const definitionsMerged = dictTermsGroup(definitionsBySequence['-1'], dictionaries);
         for (const sequence in definitionsBySequence) {
@@ -62,7 +63,7 @@ class Translator {
 
             const result = definitionsBySequence[sequence];
 
-            const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence));
+            const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence), options.dictionary.main);
             const definitionsByGloss = dictTermsMergeByGloss(result, rawDefinitionsBySequence);
 
             // postprocess glossaries
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index f2f7f687..505331ea 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -3,6 +3,7 @@
 
     <div class="checkbox">
         <label><input type="checkbox" class="dict-enabled" {{#if enabled}}checked{{/if}}> Enable search</label>
+        <label><input type="radio" class="dict-main" {{#if main}}checked{{/if}}> Set as main dictionary</label>
     </div>
     <div class="form-group options-advanced">
         <label for="dict-{{title}}">Result priority</label>
-- 
cgit v1.2.3


From 7783aa4c1a36784b709aba768c17d9476a16a43d Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:58:57 +0300
Subject: reset main dictionary on purge

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

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 4d248304..cab9c056 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -302,6 +302,7 @@ async function onDictionaryPurge(e) {
         await utilDatabasePurge();
         const options = await optionsLoad();
         options.dictionaries = {};
+        options.dictionary.main = '';
         await optionsSave(options);
 
         await dictionaryGroupsPopulate(options);
-- 
cgit v1.2.3


From 4e57fa1ad1cd85e18b2ae2c1d43480832533f9a7 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 12 Oct 2017 01:10:05 +0300
Subject: merged mode: remove options.dictionary.main

---
 ext/bg/js/options.js    | 4 ----
 ext/bg/js/settings.js   | 4 ----
 ext/bg/js/translator.js | 5 +++--
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 0aa6d7c6..b49c32da 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -154,10 +154,6 @@ function optionsSetDefaults(options) {
 
         dictionaries: {},
 
-        dictionary: {
-            main: ''
-        },
-
         anki: {
             enable: false,
             server: 'http://127.0.0.1:8765',
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index cab9c056..6016b38a 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -61,9 +61,6 @@ async function formRead() {
         const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
         const enabled = dictionary.find('.dict-enabled').prop('checked');
         const main = dictionary.find('.dict-main').prop('checked');
-        if (main) {
-            optionsNew.dictionary.main = title;
-        }
         optionsNew.dictionaries[title] = {priority, enabled, main};
     });
 
@@ -302,7 +299,6 @@ async function onDictionaryPurge(e) {
         await utilDatabasePurge();
         const options = await optionsLoad();
         options.dictionaries = {};
-        options.dictionary.main = '';
         await optionsSave(options);
 
         await dictionaryGroupsPopulate(options);
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 737abd08..99344b95 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -50,10 +50,11 @@ class Translator {
 
     async findTermsMerged(text, dictionaries, alphanumeric) {
         const options = await apiOptionsGet();
+        const mainDictionary = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].main).concat([''])[0];
         const titles = Object.keys(dictionaries);
         const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
 
-        const definitionsBySequence = dictTermsMergeBySequence(definitions, options.dictionary.main);
+        const definitionsBySequence = dictTermsMergeBySequence(definitions, mainDictionary);
 
         const definitionsMerged = [];
         const mergedByTermIndices = new Set();
@@ -64,7 +65,7 @@ class Translator {
 
             const result = definitionsBySequence[sequence];
 
-            const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence), options.dictionary.main);
+            const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence), mainDictionary);
             const definitionsByGloss = dictTermsMergeByGloss(result, rawDefinitionsBySequence);
             dictTermsMergeByGloss(result, definitionsBySequence['-1'], definitionsByGloss, mergedByTermIndices);
 
-- 
cgit v1.2.3


From 8d660e282911ffb5d7b504784a3c09f13b164953 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 12 Oct 2017 09:59:09 +0300
Subject: add compact tags

---
 ext/bg/js/dictionary.js | 26 ++++++++++++++++++++++++++
 ext/bg/js/options.js    |  3 ++-
 ext/bg/js/settings.js   |  2 ++
 ext/bg/js/templates.js  | 36 ++++++++++++++++++------------------
 ext/bg/js/translator.js | 13 +++++++++++++
 ext/bg/settings.html    |  4 ++++
 tmpl/terms.html         | 14 +++++++-------
 7 files changed, 72 insertions(+), 26 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index ee4f5946..14f90d29 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -110,6 +110,32 @@ function dictTermsUndupe(definitions) {
     return definitionsUnique;
 }
 
+function dictTermsCompressTags(definitions) {
+    let lastDictionary = '';
+    let lastPos = '';
+
+    for (const definition of definitions) {
+        const dictionary = JSON.stringify(definition.tags.filter(tag => tag.category === 'dictionary').map(tag => tag.name).sort());
+        const pos = JSON.stringify(definition.tags.filter(tag => tag.category === 'pos').map(tag => tag.name).sort());
+
+        const filterOutCategories = [];
+
+        if (lastDictionary === dictionary) {
+            filterOutCategories.push('dictionary');
+        } else {
+            lastDictionary = dictionary;
+        }
+
+        if (lastPos === pos) {
+            filterOutCategories.push('pos');
+        } else {
+            lastPos = pos;
+        }
+
+        definition.tags = definition.tags.filter(tag => !filterOutCategories.includes(tag.category));
+    }
+}
+
 function dictTermsGroup(definitions, dictionaries) {
     const groups = {};
     for (const definition of definitions) {
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index b49c32da..eef893c7 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -139,7 +139,8 @@ function optionsSetDefaults(options) {
             popupWidth: 400,
             popupHeight: 250,
             popupOffset: 10,
-            showGuide: true
+            showGuide: true,
+            compactTags: false
         },
 
         scanning: {
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 6016b38a..f59c3ad0 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -22,6 +22,7 @@ async function formRead() {
     const optionsNew = $.extend(true, {}, optionsOld);
 
     optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
+    optionsNew.general.compactTags = $('#compact-tags').prop('checked');
     optionsNew.general.resultOutputMode = $('#result-output-mode').val();
     optionsNew.general.audioSource = $('#audio-playback-source').val();
     optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
@@ -125,6 +126,7 @@ async function onReady() {
     const options = await optionsLoad();
 
     $('#show-usage-guide').prop('checked', options.general.showGuide);
+    $('#compact-tags').prop('checked', options.general.compactTags);
     $('#result-output-mode').val(options.general.resultOutputMode);
     $('#audio-playback-source').val(options.general.audioSource);
     $('#audio-playback-volume').val(options.general.audioVolume);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 19c49337..e8bd43e9 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -206,30 +206,16 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
 templates['terms.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.only : 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.tags : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  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,(depth0 != null ? depth0.only : depth0),{"name":"if","hash":{},"fn":container.program(5, 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(9, data, 0),"inverse":container.program(13, data, 0),"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "<div>\n    ("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.only : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    only)\n</div>\n";
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = container.lambda(depth0, depth0)) != null ? stack1 : "")
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n";
-},"4":function(container,depth0,helpers,partials,data) {
-    return ", ";
-},"6":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
   return "<div>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(7, 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";
-},"7":function(container,depth0,helpers,partials,data) {
+},"3":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "    <span class=\"label label-default tag-"
@@ -239,6 +225,20 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + "\">"
     + 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)))
     + "</span>\n";
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<div>\n    ("
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.only : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    only)\n</div>\n";
+},"6":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = container.lambda(depth0, depth0)) != 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 stack1;
 
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 99344b95..e307efc0 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -37,6 +37,7 @@ class Translator {
     }
 
     async findTermsGrouped(text, dictionaries, alphanumeric) {
+        const options = await apiOptionsGet();
         const titles = Object.keys(dictionaries);
         const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
 
@@ -45,6 +46,12 @@ class Translator {
             await this.buildTermFrequencies(definition, titles);
         }
 
+        if (options.general.compactTags) {
+            for (const definition of definitionsGrouped) {
+                dictTermsCompressTags(definition.definitions);
+            }
+        }
+
         return {length, definitions: definitionsGrouped};
     }
 
@@ -120,6 +127,12 @@ class Translator {
             await this.buildTermFrequencies(definition, titles);
         }
 
+        if (options.general.compactTags) {
+            for (const definition of definitionsMerged) {
+                dictTermsCompressTags(definition.definitions);
+            }
+        }
+
         return {length, definitions: dictTermsSort(definitionsMerged)};
     }
 
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 6274f3cb..d4b71932 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -35,6 +35,10 @@
                     <label><input type="checkbox" id="show-usage-guide"> Show usage guide on startup</label>
                 </div>
 
+                <div class="checkbox">
+                    <label><input type="checkbox" id="compact-tags"> Compact tags</label>
+                </div>
+
                 <div class="checkbox">
                     <label><input type="checkbox" id="show-advanced-options"> Show advanced options</label>
                 </div>
diff --git a/tmpl/terms.html b/tmpl/terms.html
index 72bf9824..e037c544 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -1,4 +1,11 @@
 {{#*inline "definition"}}
+{{#if tags}}
+<div>
+    {{#each tags}}
+    <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
+    {{/each}}
+</div>
+{{/if}}
 {{#if only}}
 <div>
     (
@@ -8,13 +15,6 @@
     only)
 </div>
 {{/if}}
-{{#if tags}}
-<div>
-    {{#each tags}}
-    <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
-    {{/each}}
-</div>
-{{/if}}
 {{#if glossary.[1]}}
 <ul>
     {{#each glossary}}
-- 
cgit v1.2.3


From 03f7ca23e118c5ca804eef35cea05070e69779c7 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 15 Oct 2017 05:19:16 +0300
Subject: merged mode: add secondary searches

---
 ext/bg/js/database.js   | 26 ++++++++++++++++++++++++++
 ext/bg/js/settings.js   | 12 +++++++-----
 ext/bg/js/templates.js  |  4 +++-
 ext/bg/js/translator.js | 20 ++++++++++++++++++--
 tmpl/dictionary.html    |  5 +++++
 5 files changed, 59 insertions(+), 8 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 8350e214..dea78196 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -86,6 +86,32 @@ class Database {
         return results;
     }
 
+    async findTermsExact(term, reading, titles) {
+        if (!this.db) {
+            throw 'Database not initialized';
+        }
+
+        const results = [];
+        await this.db.terms.where('expression').equals(term).each(row => {
+            if (row.reading === reading && titles.includes(row.dictionary)) {
+                results.push({
+                    expression: row.expression,
+                    reading: row.reading,
+                    definitionTags: dictFieldSplit(row.definitionTags),
+                    termTags: dictFieldSplit(row.termTags || ''),
+                    rules: dictFieldSplit(row.rules),
+                    glossary: row.glossary,
+                    score: row.score,
+                    dictionary: row.dictionary,
+                    id: row.id,
+                    sequence: typeof row.sequence === 'undefined' ? -1 : row.sequence
+                });
+            }
+        });
+
+        return results;
+    }
+
     async findTermsBySequence(sequence, mainDictionary) {
         if (!this.db) {
             throw 'Database not initialized';
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index f59c3ad0..b9c59a4a 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -62,7 +62,8 @@ async function formRead() {
         const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
         const enabled = dictionary.find('.dict-enabled').prop('checked');
         const main = dictionary.find('.dict-main').prop('checked');
-        optionsNew.dictionaries[title] = {priority, enabled, main};
+        const allowSecondarySearches = dictionary.find('.dict-allow-secondary-searches').prop('checked');
+        optionsNew.dictionaries[title] = {priority, enabled, main, allowSecondarySearches};
     });
 
     return {optionsNew, optionsOld};
@@ -262,14 +263,15 @@ async function dictionaryGroupsPopulate(options) {
     }
 
     for (const dictRow of dictRowsSort(dictRows, options)) {
-        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0, main: false};
+        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0, main: false, allowSecondarySearches: false};
         const dictHtml = await apiTemplateRender('dictionary.html', {
             title: dictRow.title,
             version: dictRow.version,
             revision: dictRow.revision,
             priority: dictOptions.priority,
             enabled: dictOptions.enabled,
-            main: dictOptions.main
+            main: dictOptions.main,
+            allowSecondarySearches: dictOptions.allowSecondarySearches
         });
 
         dictGroups.append($(dictHtml));
@@ -277,7 +279,7 @@ async function dictionaryGroupsPopulate(options) {
 
     formUpdateVisibility(options);
 
-    $('.dict-enabled, .dict-priority').change(e => {
+    $('.dict-enabled, .dict-priority, .dict-allow-secondary-searches').change(e => {
         dictionaryGroupsSort();
         onFormOptionsChanged(e);
     });
@@ -329,7 +331,7 @@ async function onDictionaryImport(e) {
 
         const options = await optionsLoad();
         const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
-        options.dictionaries[summary.title] = {enabled: true, priority: 0, main: false};
+        options.dictionaries[summary.title] = {enabled: true, priority: 0, main: false, allowSecondarySearches: false};
         await optionsSave(options);
 
         await dictionaryGroupsPopulate(options);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index b7b4721e..2e13053b 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,9 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.revision || (depth0 != null ? depth0.revision : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"revision","hash":{},"data":data}) : helper)))
     + "</small></h4>\n\n    <div class=\"checkbox\">\n        <label><input type=\"checkbox\" class=\"dict-enabled\" "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enabled : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Enable search</label>\n        <label><input type=\"radio\" class=\"dict-main\" "
+    + "> Enable search</label>\n    </div>\n    <div class=\"checkbox options-advanced\">\n        <label><input type=\"checkbox\" class=\"dict-allow-secondary-searches\" "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.allowSecondarySearches : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "> Allow secondary searches</label>\n    </div>\n    <div class=\"radio\">\n        <label><input type=\"radio\" class=\"dict-main\" "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.main : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "> Set as main dictionary</label>\n    </div>\n    <div class=\"form-group options-advanced\">\n        <label for=\"dict-"
     + 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)))
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index c102f6a8..29bb857b 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -58,6 +58,7 @@ class Translator {
     async findTermsMerged(text, dictionaries, alphanumeric) {
         const options = await apiOptionsGet();
         const mainDictionary = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].main).concat([''])[0];
+        const secondarySearchTitles = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].allowSecondarySearches);
         const titles = Object.keys(dictionaries);
         const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
 
@@ -74,7 +75,23 @@ class Translator {
 
             const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence), mainDictionary);
             const definitionsByGloss = dictTermsMergeByGloss(result, rawDefinitionsBySequence);
-            dictTermsMergeByGloss(result, definitionsBySequence['-1'], definitionsByGloss, mergedByTermIndices);
+
+            const secondarySearchResults = [];
+            if (secondarySearchTitles.length) {
+                for (const expression of result.expressions.keys()) {
+                    if (expression === text) {
+                        continue;
+                    }
+
+                    for (const reading of result.expressions.get(expression).keys()) {
+                        for (const definition of await this.database.findTermsExact(expression, reading, secondarySearchTitles)) {
+                            secondarySearchResults.push(definition);
+                        }
+                    }
+                }
+            }
+
+            dictTermsMergeByGloss(result, definitionsBySequence['-1'].concat(secondarySearchResults), definitionsByGloss, mergedByTermIndices);
 
             for (const gloss in definitionsByGloss) {
                 const definition = definitionsByGloss[gloss];
@@ -88,7 +105,6 @@ class Translator {
 
             dictTermsSort(result.definitions, dictionaries);
 
-            // turn the Map()/Set() mess to [{expression: E1, reading: R1}, {...}] and tag popular/normal/rare instead of actual tags
             const expressions = [];
             for (const expression of result.expressions.keys()) {
                 for (const reading of result.expressions.get(expression).keys()) {
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 505331ea..6b81c0c9 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -3,6 +3,11 @@
 
     <div class="checkbox">
         <label><input type="checkbox" class="dict-enabled" {{#if enabled}}checked{{/if}}> Enable search</label>
+    </div>
+    <div class="checkbox options-advanced">
+        <label><input type="checkbox" class="dict-allow-secondary-searches" {{#if allowSecondarySearches}}checked{{/if}}> Allow secondary searches</label>
+    </div>
+    <div class="radio">
         <label><input type="radio" class="dict-main" {{#if main}}checked{{/if}}> Set as main dictionary</label>
     </div>
     <div class="form-group options-advanced">
-- 
cgit v1.2.3


From 0404b42f6188c22e09afd073a755af749a9d0810 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 15 Oct 2017 09:45:00 +0300
Subject: compact glossaries, line break after tags: on/off

---
 ext/bg/js/options.js      |   7 +-
 ext/bg/js/settings.js     |   4 +
 ext/bg/js/templates.js    | 227 ++++++++++++++++++++++++----------------------
 ext/bg/settings.html      |  12 ++-
 ext/mixed/css/display.css |  18 ++++
 ext/mixed/js/display.js   |   2 +
 tmpl/terms.html           |  35 ++++---
 7 files changed, 177 insertions(+), 128 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index eef893c7..a2ee6a0e 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -140,7 +140,9 @@ function optionsSetDefaults(options) {
             popupHeight: 250,
             popupOffset: 10,
             showGuide: true,
-            compactTags: false
+            compactTags: false,
+            tagLineBreak: false,
+            compactGlossaries: false
         },
 
         scanning: {
@@ -213,6 +215,9 @@ function optionsVersion(options) {
             } else {
                 options.general.resultOutputMode = 'split';
             }
+            options.general.compactTags = false;
+            options.general.tagLineBreak = true;
+            options.general.compactGlossaries = false;
         }
     ];
 
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index b9c59a4a..7a8e1fea 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -23,6 +23,8 @@ async function formRead() {
 
     optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
     optionsNew.general.compactTags = $('#compact-tags').prop('checked');
+    optionsNew.general.tagLineBreak = $('#tag-line-break').prop('checked');
+    optionsNew.general.compactGlossaries = $('#compact-glossaries').prop('checked');
     optionsNew.general.resultOutputMode = $('#result-output-mode').val();
     optionsNew.general.audioSource = $('#audio-playback-source').val();
     optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
@@ -128,6 +130,8 @@ async function onReady() {
 
     $('#show-usage-guide').prop('checked', options.general.showGuide);
     $('#compact-tags').prop('checked', options.general.compactTags);
+    $('#tag-line-break').prop('checked', options.general.tagLineBreak);
+    $('#compact-glossaries').prop('checked', options.general.compactGlossaries);
     $('#result-output-mode').val(options.general.resultOutputMode);
     $('#audio-playback-source').val(options.general.audioSource);
     $('#audio-playback-volume').val(options.general.audioVolume);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 2e13053b..95d77194 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -209,15 +209,19 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.definitionTags : 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.only : depth0),{"name":"if","hash":{},"fn":container.program(5, 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(9, data, 0),"inverse":container.program(13, data, 0),"data":data})) != null ? stack1 : "");
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.only : depth0),{"name":"if","hash":{},"fn":container.program(7, 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(11, data, 0),"inverse":container.program(17, data, 0),"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data) {
-    var stack1;
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return "<div>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitionTags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return "<div "
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.tagLineBreak : depth0),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ">\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.definitionTags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"3":function(container,depth0,helpers,partials,data) {
+    return "style=\"display: inline-block;\"";
+},"5":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "    <span class=\"label label-default tag-"
@@ -227,112 +231,120 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + "\">"
     + 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)))
     + "</span>\n";
-},"5":function(container,depth0,helpers,partials,data) {
-    var stack1;
+},"7":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return "<div>\n    ("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.only : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return "<div "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.compactGlossaries : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ">\n    ("
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.only : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    only)\n</div>\n";
-},"6":function(container,depth0,helpers,partials,data) {
+},"8":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return ((stack1 = container.lambda(depth0, depth0)) != 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 : "")
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(9, 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 stack1;
+    return ", ";
+},"11":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return "<ul>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return "<ul "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.compactGlossaries : depth0),{"name":"if","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ">\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(14, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ul>\n";
-},"10":function(container,depth0,helpers,partials,data) {
+},"12":function(container,depth0,helpers,partials,data) {
+    return "class=\"compact\"";
+},"14":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(11, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(15, 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";
-},"11":function(container,depth0,helpers,partials,data) {
+},"15":function(container,depth0,helpers,partials,data) {
     return container.escapeExpression(container.lambda(depth0, depth0));
-},"13":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(14, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
+},"17":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), buffer = 
+  "<div class=\"glossary-item "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.compactGlossaries : depth0),{"name":"if","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\">";
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(alias1,options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
-},"14":function(container,depth0,helpers,partials,data) {
+},"18":function(container,depth0,helpers,partials,data) {
+    return "compact";
+},"20":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
-},"16":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"22":function(container,depth0,helpers,partials,data,blockParams,depths) {
     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(17, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.merged : depth0),{"name":"unless","hash":{},"fn":container.program(19, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.merged : depth0),{"name":"unless","hash":{},"fn":container.program(25, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        <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.merged : depth0),{"name":"if","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.program(37, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.merged : depth0),{"name":"if","hash":{},"fn":container.program(28, data, 0, blockParams, depths),"inverse":container.program(43, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
     + "\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"if","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"if","hash":{},"fn":container.program(47, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.termTags : depth0),{"name":"if","hash":{},"fn":container.program(43, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(46, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(51, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n    <div class=\"glossary\">\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.grouped : depth0),{"name":"if","hash":{},"fn":container.program(49, data, 0, blockParams, depths),"inverse":container.program(55, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.grouped : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(60, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
     + "    </div>\n\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(58, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(63, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
-},"17":function(container,depth0,helpers,partials,data) {
+},"23":function(container,depth0,helpers,partials,data) {
     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";
-},"19":function(container,depth0,helpers,partials,data) {
+},"25":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.playback : depth0),{"name":"if","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"20":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.playback : depth0),{"name":"if","hash":{},"fn":container.program(26, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"26":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";
-},"22":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"28":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.expressions : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"23":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.expressions : depth0),{"name":"each","hash":{},"fn":container.program(29, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"29":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", buffer = 
   "    <div class=\"expression\">\n        <span class=\"expression-"
     + container.escapeExpression(((helper = (helper = helpers.jmdictTermFrequency || (depth0 != null ? depth0.jmdictTermFrequency : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"jmdictTermFrequency","hash":{},"data":data}) : helper)))
     + "\">";
-  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
+  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(30, data, 0, blockParams, depths),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</span><!--\n     --><div class=\"peek-wrapper\">"
-    + ((stack1 = helpers["if"].call(alias1,(depths[1] != null ? depths[1].playback : depths[1]),{"name":"if","hash":{},"fn":container.program(27, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(29, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depths[1] != null ? depths[1].playback : depths[1]),{"name":"if","hash":{},"fn":container.program(33, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "<!--\n     --></div><!--\n     --><span class=\""
-    + ((stack1 = helpers["if"].call(alias1,(data && data.last),{"name":"if","hash":{},"fn":container.program(35, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(data && data.last),{"name":"if","hash":{},"fn":container.program(41, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">、</span><!--\n --></div>\n";
-},"24":function(container,depth0,helpers,partials,data) {
+},"30":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options;
 
-  stack1 = ((helper = (helper = helpers.furigana || (depth0 != null ? depth0.furigana : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"furigana","hash":{},"fn":container.program(25, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
+  stack1 = ((helper = (helper = helpers.furigana || (depth0 != null ? depth0.furigana : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"furigana","hash":{},"fn":container.program(31, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.furigana) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { return stack1; }
   else { return ''; }
-},"25":function(container,depth0,helpers,partials,data) {
+},"31":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return ((stack1 = container.lambda(depth0, depth0)) != null ? stack1 : "");
-},"27":function(container,depth0,helpers,partials,data) {
+},"33":function(container,depth0,helpers,partials,data) {
     return "<a href=\"#\" class=\"action-play-audio\"><img src=\"/mixed/img/play-audio.png\" title=\"Play audio\" alt></a>\n";
-},"29":function(container,depth0,helpers,partials,data) {
+},"35":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<div class=\"tags\">"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(30, 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(36, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "            </div>\n";
-},"30":function(container,depth0,helpers,partials,data) {
+},"36":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<span class=\"label label-default tag-"
@@ -342,13 +354,13 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + "\">"
     + 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)))
     + "</span>\n";
-},"32":function(container,depth0,helpers,partials,data) {
+},"38":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<div class=\"frequencies\">"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.frequencies : depth0),{"name":"each","hash":{},"fn":container.program(33, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.frequencies : depth0),{"name":"each","hash":{},"fn":container.program(39, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "            </div>\n            ";
-},"33":function(container,depth0,helpers,partials,data) {
+},"39":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<span class=\"label label-default tag-frequency\">"
@@ -356,38 +368,23 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + ":"
     + alias4(((helper = (helper = helpers.frequency || (depth0 != null ? depth0.frequency : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"frequency","hash":{},"data":data}) : helper)))
     + "</span>\n";
-},"35":function(container,depth0,helpers,partials,data) {
+},"41":function(container,depth0,helpers,partials,data) {
     return "invisible";
-},"37":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, options, buffer = 
+},"43":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), 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(24, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
+  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(30, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(alias1,options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
-  return buffer + "</div>\n";
-},"39":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "    <div class=\"reasons\">\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(40, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n";
-},"40":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "        <span class=\"reasons\">"
-    + container.escapeExpression(container.lambda(depth0, depth0))
-    + "</span> "
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(41, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n";
-},"41":function(container,depth0,helpers,partials,data) {
-    return "&laquo;";
-},"43":function(container,depth0,helpers,partials,data) {
+  return buffer + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.termTags : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"44":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "    <div>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.termTags : depth0),{"name":"each","hash":{},"fn":container.program(44, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return "    <div style=\"display: inline-block;\">\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.termTags : depth0),{"name":"each","hash":{},"fn":container.program(45, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n";
-},"44":function(container,depth0,helpers,partials,data) {
+},"45":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "        <span class=\"label label-default tag-"
@@ -397,13 +394,29 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + "\">"
     + 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)))
     + "</span>\n";
-},"46":function(container,depth0,helpers,partials,data) {
+},"47":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "    <div class=\"reasons\">\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(48, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "    </div>\n";
+},"48":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <span class=\"reasons\">"
+    + container.escapeExpression(container.lambda(depth0, depth0))
+    + "</span> "
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(49, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n";
+},"49":function(container,depth0,helpers,partials,data) {
+    return "&laquo;";
+},"51":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "    <div>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.frequencies : depth0),{"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 || {}),(depth0 != null ? depth0.frequencies : depth0),{"name":"each","hash":{},"fn":container.program(52, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n";
-},"47":function(container,depth0,helpers,partials,data) {
+},"52":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "        <span class=\"label label-default tag-frequency\">"
@@ -411,67 +424,67 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + ":"
     + alias4(((helper = (helper = helpers.frequency || (depth0 != null ? depth0.frequency : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"frequency","hash":{},"data":data}) : helper)))
     + "</span>\n";
-},"49":function(container,depth0,helpers,partials,data) {
+},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var 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(50, data, 0),"inverse":container.program(53, data, 0),"data":data})) != null ? stack1 : "");
-},"50":function(container,depth0,helpers,partials,data) {
+  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(55, data, 0, blockParams, depths),"inverse":container.program(58, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "        <ol>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(51, 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(56, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </ol>\n";
-},"51":function(container,depth0,helpers,partials,data) {
+},"56":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "            <li>"
-    + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"tagLineBreak":(depths[1] != null ? depths[1].tagLineBreak : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "</li>\n";
-},"53":function(container,depth0,helpers,partials,data) {
+},"58":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0),"tagLineBreak":(depth0 != null ? depth0.tagLineBreak : depth0)},"data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.merged : depth0),{"name":"if","hash":{},"fn":container.program(49, data, 0, blockParams, depths),"inverse":container.program(56, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"56":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.merged : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(61, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"61":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+  return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0),"tagLineBreak":(depth0 != null ? depth0.tagLineBreak : depth0)},"data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "        ";
-},"58":function(container,depth0,helpers,partials,data) {
+},"63":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(25, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
+  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(31, 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";
-},"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"65":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(61, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"61":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"66":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(62, 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(67, 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]),"merged":(depths[1] != null ? depths[1].merged : 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 : "");
-},"62":function(container,depth0,helpers,partials,data) {
+    + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"tagLineBreak":(depths[1] != null ? depths[1].tagLineBreak : depths[1]),"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"merged":(depths[1] != null ? depths[1].merged : 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 : "");
+},"67":function(container,depth0,helpers,partials,data) {
     return "<hr>";
-},"64":function(container,depth0,helpers,partials,data) {
+},"69":function(container,depth0,helpers,partials,data) {
     return "<p class=\"note\">No results found.</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "\n\n"
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.program(64, 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(65, data, 0, blockParams, depths),"inverse":container.program(69, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
 
   fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"args":["definition"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(16, data, 0, blockParams, depths),"inverse":container.noop,"args":["term"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["term"],"data":data}) || fn;
   return fn;
   }
 
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index d4b71932..db8f4151 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -39,6 +39,14 @@
                     <label><input type="checkbox" id="compact-tags"> Compact tags</label>
                 </div>
 
+                <div class="checkbox">
+                    <label><input type="checkbox" id="tag-line-break"> Line break after tags</label>
+                </div>
+
+                <div class="checkbox">
+                    <label><input type="checkbox" id="compact-glossaries"> Compact glossaries</label>
+                </div>
+
                 <div class="checkbox">
                     <label><input type="checkbox" id="show-advanced-options"> Show advanced options</label>
                 </div>
@@ -48,9 +56,9 @@
                 </div>
 
                 <div class="form-group">
-                    <label for="result-output-mode">Result output mode</label>
+                    <label for="result-output-mode">Result grouping</label>
                     <select class="form-control" id="result-output-mode">
-                        <option value="group">Group results by written form and reading</option>
+                        <option value="group">Group results by term-reading pairs</option>
                         <option value="merge">Group results by main dictionary entry ID (experimental)</option>
                         <option value="split">Split definitions to their own results</option>
                     </select>
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 670930ae..b31774f9 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -181,6 +181,20 @@ hr {
     padding-left: 1.4em;
 }
 
+.glossary ul.compact {
+    display: inline;
+    list-style: none;
+    padding-left: 0px;
+}
+
+.glossary .compact li {
+    display: inline;
+}
+
+.glossary .compact li:not(:first-child):before {
+    content: " | ";
+}
+
 .glossary li {
     color: #777;
 }
@@ -189,6 +203,10 @@ hr {
     color: #000;
 }
 
+div.glossary-item.compact {
+    display: inline;
+}
+
 .glyph {
     font-family: kanji-stroke-orders;
     font-size: 120px;
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index e3b5ee50..daa90b4e 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -239,6 +239,8 @@ class Display {
                 grouped: options.general.resultOutputMode === 'group',
                 merged: options.general.resultOutputMode === 'merge',
                 playback: options.general.audioSource !== 'disabled',
+                tagLineBreak: options.general.tagLineBreak,
+                compactGlossaries: options.general.compactGlossaries,
                 debug: options.general.debugInfo
             };
 
diff --git a/tmpl/terms.html b/tmpl/terms.html
index f35caed4..eaae7384 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -1,13 +1,13 @@
 {{#*inline "definition"}}
 {{#if definitionTags}}
-<div>
+<div {{#unless tagLineBreak}}style="display: inline-block;"{{/unless}}>
     {{#each definitionTags}}
     <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
     {{/each}}
 </div>
 {{/if}}
 {{#if only}}
-<div>
+<div {{#if compactGlossaries}}style="display: inline-block;"{{/if}}>
     (
     {{~#each only~}}
     {{{.}}}{{#unless @last}}, {{/unless}}
@@ -16,13 +16,13 @@
 </div>
 {{/if}}
 {{#if glossary.[1]}}
-<ul>
+<ul {{#if compactGlossaries}}class="compact"{{/if}}>
     {{#each glossary}}
     <li><span class="glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
     {{/each}}
 </ul>
 {{else}}
-<div class="glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
+<div class="glossary-item {{#if compactGlossaries}}compact{{/if}}">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
 {{/if}}
 {{/inline}}
 
@@ -70,6 +70,13 @@
     {{/each}}
     {{else}}
     <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div>
+    {{#if termTags}}
+    <div style="display: inline-block;">
+        {{#each termTags}}
+        <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
+        {{/each}}
+    </div>
+    {{/if}}
     {{/if}}
 
     {{#if reasons}}
@@ -80,14 +87,6 @@
     </div>
     {{/if}}
 
-    {{#if termTags}}
-    <div>
-        {{#each termTags}}
-        <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
-        {{/each}}
-    </div>
-    {{/if}}
-
     {{#if frequencies}}
     <div>
         {{#each frequencies}}
@@ -101,24 +100,24 @@
         {{#if definitions.[1]}}
         <ol>
             {{#each definitions}}
-            <li>{{> definition}}</li>
+            <li>{{> definition tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}</li>
             {{/each}}
         </ol>
         {{else}}
-        {{> definition definitions.[0]}}
+        {{> definition definitions.[0] tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}}
         {{/if}}
         {{else if merged}}
         {{#if definitions.[1]}}
         <ol>
             {{#each definitions}}
-            <li>{{> definition}}</li>
+            <li>{{> definition tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}</li>
             {{/each}}
         </ol>
         {{else}}
-        {{> definition definitions.[0]}}
+        {{> definition definitions.[0] tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}}
         {{/if}}
         {{else}}
-        {{> definition}}
+        {{> definition tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}}
         {{/if}}
     </div>
 
@@ -131,7 +130,7 @@
 {{#if definitions}}
 {{#each definitions}}
 {{#unless @first}}<hr>{{/unless}}
-{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback}}
+{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}
 {{/each}}
 {{else}}
 <p class="note">No results found.</p>
-- 
cgit v1.2.3


From 7913b094b7b50fba562917a530bc04df81e51fe1 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sun, 15 Oct 2017 10:38:30 +0300
Subject: scrap tagLineBreak option

---
 ext/bg/js/options.js    |  2 --
 ext/bg/js/settings.js   |  2 --
 ext/bg/js/templates.js  | 10 +++++-----
 ext/bg/settings.html    |  4 ----
 ext/mixed/js/display.js |  1 -
 tmpl/terms.html         | 14 +++++++-------
 6 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 968fbf23..86c4e27c 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -141,7 +141,6 @@ function optionsSetDefaults(options) {
             popupOffset: 10,
             showGuide: true,
             compactTags: false,
-            tagLineBreak: true,
             compactGlossaries: false
         },
 
@@ -216,7 +215,6 @@ function optionsVersion(options) {
                 options.general.resultOutputMode = 'split';
             }
             options.general.compactTags = false;
-            options.general.tagLineBreak = true;
             options.general.compactGlossaries = false;
         }
     ];
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 7a8e1fea..37e5126e 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -23,7 +23,6 @@ async function formRead() {
 
     optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
     optionsNew.general.compactTags = $('#compact-tags').prop('checked');
-    optionsNew.general.tagLineBreak = $('#tag-line-break').prop('checked');
     optionsNew.general.compactGlossaries = $('#compact-glossaries').prop('checked');
     optionsNew.general.resultOutputMode = $('#result-output-mode').val();
     optionsNew.general.audioSource = $('#audio-playback-source').val();
@@ -130,7 +129,6 @@ async function onReady() {
 
     $('#show-usage-guide').prop('checked', options.general.showGuide);
     $('#compact-tags').prop('checked', options.general.compactTags);
-    $('#tag-line-break').prop('checked', options.general.tagLineBreak);
     $('#compact-glossaries').prop('checked', options.general.compactGlossaries);
     $('#result-output-mode').val(options.general.resultOutputMode);
     $('#audio-playback-source').val(options.general.audioSource);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 95d77194..5b5e63f5 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -215,7 +215,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return "<div "
-    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.tagLineBreak : depth0),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.compactGlossaries : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ">\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.definitionTags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
@@ -438,12 +438,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "            <li>"
-    + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"tagLineBreak":(depths[1] != null ? depths[1].tagLineBreak : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "</li>\n";
 },"58":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0),"tagLineBreak":(depth0 != null ? depth0.tagLineBreak : depth0)},"data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0)},"data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
@@ -451,7 +451,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"61":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0),"tagLineBreak":(depth0 != null ? depth0.tagLineBreak : depth0)},"data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+  return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0)},"data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "        ";
 },"63":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
@@ -469,7 +469,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 
   return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(67, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
-    + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"tagLineBreak":(depths[1] != null ? depths[1].tagLineBreak : depths[1]),"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"merged":(depths[1] != null ? depths[1].merged : 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 : "");
+    + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"merged":(depths[1] != null ? depths[1].merged : 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 : "");
 },"67":function(container,depth0,helpers,partials,data) {
     return "<hr>";
 },"69":function(container,depth0,helpers,partials,data) {
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index db8f4151..408d5aab 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -39,10 +39,6 @@
                     <label><input type="checkbox" id="compact-tags"> Compact tags</label>
                 </div>
 
-                <div class="checkbox">
-                    <label><input type="checkbox" id="tag-line-break"> Line break after tags</label>
-                </div>
-
                 <div class="checkbox">
                     <label><input type="checkbox" id="compact-glossaries"> Compact glossaries</label>
                 </div>
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index daa90b4e..41fe85eb 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -239,7 +239,6 @@ class Display {
                 grouped: options.general.resultOutputMode === 'group',
                 merged: options.general.resultOutputMode === 'merge',
                 playback: options.general.audioSource !== 'disabled',
-                tagLineBreak: options.general.tagLineBreak,
                 compactGlossaries: options.general.compactGlossaries,
                 debug: options.general.debugInfo
             };
diff --git a/tmpl/terms.html b/tmpl/terms.html
index eaae7384..7a464cba 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -1,6 +1,6 @@
 {{#*inline "definition"}}
 {{#if definitionTags}}
-<div {{#unless tagLineBreak}}style="display: inline-block;"{{/unless}}>
+<div {{#if compactGlossaries}}style="display: inline-block;"{{/if}}>
     {{#each definitionTags}}
     <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
     {{/each}}
@@ -100,24 +100,24 @@
         {{#if definitions.[1]}}
         <ol>
             {{#each definitions}}
-            <li>{{> definition tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}</li>
+            <li>{{> definition compactGlossaries=../compactGlossaries}}</li>
             {{/each}}
         </ol>
         {{else}}
-        {{> definition definitions.[0] tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}}
+        {{> definition definitions.[0] compactGlossaries=compactGlossaries}}
         {{/if}}
         {{else if merged}}
         {{#if definitions.[1]}}
         <ol>
             {{#each definitions}}
-            <li>{{> definition tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}</li>
+            <li>{{> definition compactGlossaries=../compactGlossaries}}</li>
             {{/each}}
         </ol>
         {{else}}
-        {{> definition definitions.[0] tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}}
+        {{> definition definitions.[0] compactGlossaries=compactGlossaries}}
         {{/if}}
         {{else}}
-        {{> definition tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}}
+        {{> definition compactGlossaries=compactGlossaries}}
         {{/if}}
     </div>
 
@@ -130,7 +130,7 @@
 {{#if definitions}}
 {{#each definitions}}
 {{#unless @first}}<hr>{{/unless}}
-{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}
+{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback compactGlossaries=../compactGlossaries}}
 {{/each}}
 {{else}}
 <p class="note">No results found.</p>
-- 
cgit v1.2.3


From 78442fff1a995632f2b315994f2540459ee20eca Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Tue, 24 Oct 2017 16:23:13 +0300
Subject: settings: main dictionary selection as dropdown

---
 ext/bg/js/database.js   | 15 +++++++++++
 ext/bg/js/options.js    |  3 ++-
 ext/bg/js/settings.js   | 66 ++++++++++++++++++++++++++++++++-----------------
 ext/bg/js/templates.js  |  4 +--
 ext/bg/js/translator.js |  5 ++--
 ext/bg/js/util.js       |  4 +++
 ext/bg/settings.html    |  5 ++++
 tmpl/dictionary.html    |  3 ---
 8 files changed, 73 insertions(+), 32 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 9e90e6de..fcf8ef3f 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -228,6 +228,21 @@ class Database {
         }
     }
 
+    async getTitlesWithSequences() {
+        if (!this.db) {
+            throw 'Database not initialized';
+        }
+
+        const titles = [];
+        await this.db.dictionaries.each(row => {
+            if (row.hasSequences) {
+                titles.push(row.title);
+            }
+        });
+
+        return titles;
+    }
+
     async importDictionary(archive, callback) {
         if (!this.db) {
             throw 'Database not initialized';
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 2cb7dbec..4d18c166 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -203,7 +203,8 @@ function optionsSetDefaults(options) {
             popupOffset: 10,
             showGuide: true,
             compactTags: false,
-            compactGlossaries: false
+            compactGlossaries: false,
+            mainDictionary: ''
         },
 
         scanning: {
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 37e5126e..36f2bdf9 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -25,6 +25,7 @@ async function formRead() {
     optionsNew.general.compactTags = $('#compact-tags').prop('checked');
     optionsNew.general.compactGlossaries = $('#compact-glossaries').prop('checked');
     optionsNew.general.resultOutputMode = $('#result-output-mode').val();
+    optionsNew.general.mainDictionary = $('#main-dictionary').val();
     optionsNew.general.audioSource = $('#audio-playback-source').val();
     optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
     optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
@@ -62,9 +63,8 @@ async function formRead() {
         const title = dictionary.data('title');
         const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
         const enabled = dictionary.find('.dict-enabled').prop('checked');
-        const main = dictionary.find('.dict-main').prop('checked');
         const allowSecondarySearches = dictionary.find('.dict-allow-secondary-searches').prop('checked');
-        optionsNew.dictionaries[title] = {priority, enabled, main, allowSecondarySearches};
+        optionsNew.dictionaries[title] = {priority, enabled, allowSecondarySearches};
     });
 
     return {optionsNew, optionsOld};
@@ -85,6 +85,13 @@ function formUpdateVisibility(options) {
         advanced.hide();
     }
 
+    const merge = $('.options-merge');
+    if (options.general.resultOutputMode === 'merge') {
+        merge.show();
+    } else {
+        merge.hide();
+    }
+
     const debug = $('#debug');
     if (options.general.debugInfo) {
         const temp = utilIsolate(options);
@@ -97,6 +104,29 @@ function formUpdateVisibility(options) {
     }
 }
 
+async function formMainDictionaryOptionsPopulate(options) {
+    const select = $('#main-dictionary').empty();
+
+    let titles = await utilDatabaseGetTitlesWithSequences();
+    titles = titles.filter(title => options.dictionaries[title].enabled);
+    const formOptionsHtml = [];
+    let mainDictionarySelected = false;
+    for (title of titles) {
+        if (options.general.mainDictionary === title) {
+            mainDictionarySelected = true;
+        }
+        formOptionsHtml.push(`<option value="${title}"${options.general.mainDictionary === title ? ' selected' : ''}>${title}</option>`);
+    }
+
+    if (!mainDictionarySelected) {
+        options.general.mainDictionary = '';
+    }
+
+    const notSelectedOptionHtml = `<option value=""${!mainDictionarySelected ? ' selected' : ''}>(Not selected)</option>`;
+
+    select.append($([notSelectedOptionHtml].concat(formOptionsHtml).join('')));
+}
+
 async function onFormOptionsChanged(e) {
     try {
         if (!e.originalEvent && !e.isTrigger) {
@@ -104,6 +134,7 @@ async function onFormOptionsChanged(e) {
         }
 
         const {optionsNew, optionsOld} = await formRead();
+        await formMainDictionaryOptionsPopulate(optionsNew);
         await optionsSave(optionsNew);
 
         formUpdateVisibility(optionsNew);
@@ -131,6 +162,7 @@ async function onReady() {
     $('#compact-tags').prop('checked', options.general.compactTags);
     $('#compact-glossaries').prop('checked', options.general.compactGlossaries);
     $('#result-output-mode').val(options.general.resultOutputMode);
+    $('#main-dictionary').val(options.general.mainDictionary);
     $('#audio-playback-source').val(options.general.audioSource);
     $('#audio-playback-volume').val(options.general.audioVolume);
     $('#show-debug-info').prop('checked', options.general.debugInfo);
@@ -172,6 +204,8 @@ async function onReady() {
         ankiErrorShow(e);
     }
 
+    await formMainDictionaryOptionsPopulate(options);
+
     formUpdateVisibility(options);
 }
 
@@ -243,18 +277,6 @@ function dictionaryGroupsSort() {
     dictGroups.append(dictGroupChildren);
 }
 
-function dictionarySetMain(e) {
-    const mainDictionary = $(e.target).closest('.dict-group');
-    const mainDictionaryTitle = mainDictionary.data('title');
-
-    $('.dict-group').each((index, element) => {
-        const dictionary = $(element);
-        if (dictionary.data('title') !== mainDictionaryTitle) {
-            dictionary.find('.dict-main').prop('checked', false);
-        }
-    });
-}
-
 async function dictionaryGroupsPopulate(options) {
     const dictGroups = $('#dict-groups').empty();
     const dictWarning = $('#dict-warning').hide();
@@ -265,14 +287,13 @@ async function dictionaryGroupsPopulate(options) {
     }
 
     for (const dictRow of dictRowsSort(dictRows, options)) {
-        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0, main: false, allowSecondarySearches: false};
+        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0, allowSecondarySearches: false};
         const dictHtml = await apiTemplateRender('dictionary.html', {
             title: dictRow.title,
             version: dictRow.version,
             revision: dictRow.revision,
             priority: dictOptions.priority,
             enabled: dictOptions.enabled,
-            main: dictOptions.main,
             allowSecondarySearches: dictOptions.allowSecondarySearches
         });
 
@@ -285,11 +306,6 @@ async function dictionaryGroupsPopulate(options) {
         dictionaryGroupsSort();
         onFormOptionsChanged(e);
     });
-
-    $('.dict-main').change(e => {
-        dictionarySetMain(e);
-        onFormOptionsChanged(e);
-    });
 }
 
 async function onDictionaryPurge(e) {
@@ -305,9 +321,11 @@ async function onDictionaryPurge(e) {
         await utilDatabasePurge();
         const options = await optionsLoad();
         options.dictionaries = {};
+        options.general.mainDictionary = '';
         await optionsSave(options);
 
         await dictionaryGroupsPopulate(options);
+        await formMainDictionaryOptionsPopulate(options);
     } catch (e) {
         dictionaryErrorShow(e);
     } finally {
@@ -333,10 +351,14 @@ async function onDictionaryImport(e) {
 
         const options = await optionsLoad();
         const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
-        options.dictionaries[summary.title] = {enabled: true, priority: 0, main: false, allowSecondarySearches: false};
+        options.dictionaries[summary.title] = {enabled: true, priority: 0, allowSecondarySearches: false};
+        if (summary.hasSequences && !options.general.mainDictionary) {
+            options.general.mainDictionary = summary.title;
+        }
         await optionsSave(options);
 
         await dictionaryGroupsPopulate(options);
+        await formMainDictionaryOptionsPopulate(options);
     } catch (e) {
         dictionaryErrorShow(e);
     } finally {
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index e5640394..9f72e661 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -15,9 +15,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enabled : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "> Enable search</label>\n    </div>\n    <div class=\"checkbox options-advanced\">\n        <label><input type=\"checkbox\" class=\"dict-allow-secondary-searches\" "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.allowSecondarySearches : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Allow secondary searches</label>\n    </div>\n    <div class=\"radio\">\n        <label><input type=\"radio\" class=\"dict-main\" "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.main : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Set as main dictionary</label>\n    </div>\n    <div class=\"form-group options-advanced\">\n        <label for=\"dict-"
+    + "> Allow secondary searches</label>\n    </div>\n    <div class=\"form-group options-advanced\">\n        <label for=\"dict-"
     + 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)))
     + "\">Result priority</label>\n        <input type=\"number\" value=\""
     + alias4(((helper = (helper = helpers.priority || (depth0 != null ? depth0.priority : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"priority","hash":{},"data":data}) : helper)))
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 5fcdea76..e6790fbf 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -57,12 +57,11 @@ class Translator {
 
     async findTermsMerged(text, dictionaries, alphanumeric) {
         const options = await apiOptionsGet();
-        const mainDictionary = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].main).concat([''])[0];
         const secondarySearchTitles = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].allowSecondarySearches);
         const titles = Object.keys(dictionaries);
         const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
 
-        const definitionsBySequence = dictTermsMergeBySequence(definitions, mainDictionary);
+        const definitionsBySequence = dictTermsMergeBySequence(definitions, options.general.mainDictionary);
 
         const definitionsMerged = [];
         const mergedByTermIndices = new Set();
@@ -73,7 +72,7 @@ class Translator {
 
             const result = definitionsBySequence[sequence];
 
-            const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence), mainDictionary);
+            const rawDefinitionsBySequence = await this.database.findTermsBySequence(Number(sequence), options.general.mainDictionary);
             const definitionsByGloss = dictTermsMergeByGloss(result, rawDefinitionsBySequence);
 
             const secondarySearchResults = [];
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 91b16e79..60f6452b 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -87,6 +87,10 @@ function utilDatabaseGetTitles() {
     return utilBackend().translator.database.getTitles();
 }
 
+function utilDatabaseGetTitlesWithSequences() {
+    return utilBackend().translator.database.getTitlesWithSequences();
+}
+
 function utilDatabasePurge() {
     return utilBackend().translator.database.purge();
 }
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 408d5aab..8c457652 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -60,6 +60,11 @@
                     </select>
                 </div>
 
+                <div class="form-group options-merge">
+                    <label for="main-dictionary">Main dictionary</label>
+                    <select class="form-control" id="main-dictionary"></select>
+                </div>
+
                 <div class="form-group">
                     <label for="audio-playback-source">Audio playback source</label>
                     <select class="form-control" id="audio-playback-source">
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 6b81c0c9..1dc04f0f 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -7,9 +7,6 @@
     <div class="checkbox options-advanced">
         <label><input type="checkbox" class="dict-allow-secondary-searches" {{#if allowSecondarySearches}}checked{{/if}}> Allow secondary searches</label>
     </div>
-    <div class="radio">
-        <label><input type="radio" class="dict-main" {{#if main}}checked{{/if}}> Set as main dictionary</label>
-    </div>
     <div class="form-group options-advanced">
         <label for="dict-{{title}}">Result priority</label>
         <input type="number" value="{{priority}}" id="dict-{{title}}" class="form-control dict-priority">
-- 
cgit v1.2.3


From e063a315d4bd67ef75503131137ea3faf232cff2 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 26 Oct 2017 10:20:48 +0300
Subject: settings: add missing const

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

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 36f2bdf9..19cdfa60 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -111,7 +111,7 @@ async function formMainDictionaryOptionsPopulate(options) {
     titles = titles.filter(title => options.dictionaries[title].enabled);
     const formOptionsHtml = [];
     let mainDictionarySelected = false;
-    for (title of titles) {
+    for (const title of titles) {
         if (options.general.mainDictionary === title) {
             mainDictionarySelected = true;
         }
-- 
cgit v1.2.3


From ab1e2b3d5d79d177d273bb19841615d43cd83df6 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 26 Oct 2017 10:31:59 +0300
Subject: settings: move main dictionary below Dictionaries, styling

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

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 19cdfa60..7a9ba4f9 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -122,7 +122,7 @@ async function formMainDictionaryOptionsPopulate(options) {
         options.general.mainDictionary = '';
     }
 
-    const notSelectedOptionHtml = `<option value=""${!mainDictionarySelected ? ' selected' : ''}>(Not selected)</option>`;
+    const notSelectedOptionHtml = `<option class="text-muted" value=""${!mainDictionarySelected ? ' selected' : ''}>Not selected</option>`;
 
     select.append($([notSelectedOptionHtml].concat(formOptionsHtml).join('')));
 }
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 8c457652..f430d5e2 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -60,11 +60,6 @@
                     </select>
                 </div>
 
-                <div class="form-group options-merge">
-                    <label for="main-dictionary">Main dictionary</label>
-                    <select class="form-control" id="main-dictionary"></select>
-                </div>
-
                 <div class="form-group">
                     <label for="audio-playback-source">Audio playback source</label>
                     <select class="form-control" id="audio-playback-source">
@@ -145,6 +140,11 @@
                     <h3>Dictionaries</h3>
                 </div>
 
+                <div class="form-group options-merge">
+                    <label for="main-dictionary">Main dictionary</label>
+                    <select class="form-control" id="main-dictionary"></select>
+                </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-link">purge the database</a> to delete everything.
-- 
cgit v1.2.3


From 7d29e5b533a4607d1580cb6982de3870605805af Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 29 Oct 2017 10:18:15 -0700
Subject: cleanup of settings page

---
 ext/bg/js/settings.js | 56 +++++++++++++++++++++------------------------------
 ext/bg/settings.html  | 17 +++++++++-------
 2 files changed, 33 insertions(+), 40 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 7a9ba4f9..d608a81b 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -25,7 +25,6 @@ async function formRead() {
     optionsNew.general.compactTags = $('#compact-tags').prop('checked');
     optionsNew.general.compactGlossaries = $('#compact-glossaries').prop('checked');
     optionsNew.general.resultOutputMode = $('#result-output-mode').val();
-    optionsNew.general.mainDictionary = $('#main-dictionary').val();
     optionsNew.general.audioSource = $('#audio-playback-source').val();
     optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
     optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
@@ -58,6 +57,7 @@ async function formRead() {
         optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
     }
 
+    optionsNew.general.mainDictionary = $('#dict-main').val();
     $('.dict-group').each((index, element) => {
         const dictionary = $(element);
         const title = dictionary.data('title');
@@ -85,11 +85,11 @@ function formUpdateVisibility(options) {
         advanced.hide();
     }
 
-    const merge = $('.options-merge');
+    const mainGroup = $('#dict-main-group');
     if (options.general.resultOutputMode === 'merge') {
-        merge.show();
+        mainGroup.show();
     } else {
-        merge.hide();
+        mainGroup.hide();
     }
 
     const debug = $('#debug');
@@ -105,40 +105,32 @@ function formUpdateVisibility(options) {
 }
 
 async function formMainDictionaryOptionsPopulate(options) {
-    const select = $('#main-dictionary').empty();
+    const select = $('#dict-main').empty();
+    select.append($('<option class="text-muted" value="">Not selected</option>'));
 
-    let titles = await utilDatabaseGetTitlesWithSequences();
-    titles = titles.filter(title => options.dictionaries[title].enabled);
-    const formOptionsHtml = [];
-    let mainDictionarySelected = false;
+    let mainDictionary = '';
+    const formOptions = [$];
+    const titles = await utilDatabaseGetTitlesWithSequences();
     for (const title of titles) {
-        if (options.general.mainDictionary === title) {
-            mainDictionarySelected = true;
+        select.append($(`<option value="${title}">${title}</option>`));
+        if (title === options.general.mainDictionary) {
+            mainDictionary = title;
         }
-        formOptionsHtml.push(`<option value="${title}"${options.general.mainDictionary === title ? ' selected' : ''}>${title}</option>`);
     }
 
-    if (!mainDictionarySelected) {
-        options.general.mainDictionary = '';
-    }
-
-    const notSelectedOptionHtml = `<option class="text-muted" value=""${!mainDictionarySelected ? ' selected' : ''}>Not selected</option>`;
-
-    select.append($([notSelectedOptionHtml].concat(formOptionsHtml).join('')));
+    select.val(mainDictionary);
 }
 
 async function onFormOptionsChanged(e) {
-    try {
-        if (!e.originalEvent && !e.isTrigger) {
-            return;
-        }
-
-        const {optionsNew, optionsOld} = await formRead();
-        await formMainDictionaryOptionsPopulate(optionsNew);
-        await optionsSave(optionsNew);
+    if (!e.originalEvent && !e.isTrigger) {
+        return;
+    }
 
-        formUpdateVisibility(optionsNew);
+    const {optionsNew, optionsOld} = await formRead();
+    await optionsSave(optionsNew);
+    formUpdateVisibility(optionsNew);
 
+    try {
         const ankiUpdated =
             optionsNew.anki.enable !== optionsOld.anki.enable ||
             optionsNew.anki.server !== optionsOld.anki.server;
@@ -162,7 +154,6 @@ async function onReady() {
     $('#compact-tags').prop('checked', options.general.compactTags);
     $('#compact-glossaries').prop('checked', options.general.compactGlossaries);
     $('#result-output-mode').val(options.general.resultOutputMode);
-    $('#main-dictionary').val(options.general.mainDictionary);
     $('#audio-playback-source').val(options.general.audioSource);
     $('#audio-playback-volume').val(options.general.audioVolume);
     $('#show-debug-info').prop('checked', options.general.debugInfo);
@@ -194,6 +185,7 @@ async function onReady() {
 
     try {
         await dictionaryGroupsPopulate(options);
+        await formMainDictionaryOptionsPopulate(options);
     } catch (e) {
         dictionaryErrorShow(e);
     }
@@ -204,8 +196,6 @@ async function onReady() {
         ankiErrorShow(e);
     }
 
-    await formMainDictionaryOptionsPopulate(options);
-
     formUpdateVisibility(options);
 }
 
@@ -311,7 +301,7 @@ async function dictionaryGroupsPopulate(options) {
 async function onDictionaryPurge(e) {
     e.preventDefault();
 
-    const dictControls = $('#dict-importer, #dict-groups').hide();
+    const dictControls = $('#dict-importer, #dict-groups, #dict-main-group').hide();
     const dictProgress = $('#dict-purge').show();
 
     try {
@@ -352,7 +342,7 @@ async function onDictionaryImport(e) {
         const options = await optionsLoad();
         const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
         options.dictionaries[summary.title] = {enabled: true, priority: 0, allowSecondarySearches: false};
-        if (summary.hasSequences && !options.general.mainDictionary) {
+        if (summary.hasSequences && options.general.mainDictionary === '') {
             options.general.mainDictionary = summary.title;
         }
         await optionsSave(options);
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 12556065..1565ed52 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -145,21 +145,20 @@
                     or you can simply <a href="#" id="dict-purge-link">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.
+                    Deleting individual dictionaries is not currently feasible due to limitations of browser database technology.
                 </p>
 
+                <div class="form-group" id="dict-main-group">
+                    <label for="dict-main">Main dictionary for merged mode</label>
+                    <select class="form-control" id="dict-main"></select>
+                </div>
+
                 <div class="text-danger" id="dict-purge">Dictionary data is being purged, please be patient...</div>
                 <div class="alert alert-warning" id="dict-warning">No dictionaries have been installed</div>
                 <div class="alert alert-danger" id="dict-error"></div>
 
                 <div id="dict-groups"></div>
 
-                <div class="form-group options-merge">
-                    <label for="main-dictionary">Main dictionary</label>
-                    <select class="form-control" id="main-dictionary"></select>
-                </div>
-
                 <div id="dict-import-progress">
                     Dictionary data is being imported, please be patient...
                     <div class="progress">
@@ -168,6 +167,10 @@
                 </div>
 
                 <div id="dict-importer">
+                    <p class="help-block">
+                        Select a dictionary to import for use below. Please visit the <a href="https://foosoft.net/projects/yomichan" target="_blank">Yomichan</a>
+                        homepage to download free dictionaries to use with this extension and to learn about importing proprietary EPWING dictionaries.
+                    </p>
                     <input type="file" id="dict-file">
                 </div>
             </div>
-- 
cgit v1.2.3


From c62cc01642b29c13a38f3bcc08f2fa144107c158 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 29 Oct 2017 10:42:39 -0700
Subject: simplify database interface

---
 ext/bg/js/database.js | 17 +----------------
 ext/bg/js/settings.js | 14 +++++++-------
 ext/bg/js/util.js     | 12 ++++--------
 3 files changed, 12 insertions(+), 31 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index fcf8ef3f..14b3243a 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -220,7 +220,7 @@ class Database {
         return result;
     }
 
-    async getTitles() {
+    async summarize() {
         if (this.db) {
             return this.db.dictionaries.toArray();
         } else {
@@ -228,21 +228,6 @@ class Database {
         }
     }
 
-    async getTitlesWithSequences() {
-        if (!this.db) {
-            throw 'Database not initialized';
-        }
-
-        const titles = [];
-        await this.db.dictionaries.each(row => {
-            if (row.hasSequences) {
-                titles.push(row.title);
-            }
-        });
-
-        return titles;
-    }
-
     async importDictionary(archive, callback) {
         if (!this.db) {
             throw 'Database not initialized';
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index d608a81b..9d47f33c 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -109,12 +109,12 @@ async function formMainDictionaryOptionsPopulate(options) {
     select.append($('<option class="text-muted" value="">Not selected</option>'));
 
     let mainDictionary = '';
-    const formOptions = [$];
-    const titles = await utilDatabaseGetTitlesWithSequences();
-    for (const title of titles) {
-        select.append($(`<option value="${title}">${title}</option>`));
-        if (title === options.general.mainDictionary) {
-            mainDictionary = title;
+    for (const dictRow of await utilDatabaseSummarize()) {
+        if (dictRow.hasSequences) {
+            select.append($(`<option value="${dictRow.title}">${dictRow.title}</option>`));
+            if (dictRow.title === options.general.mainDictionary) {
+                mainDictionary = dictRow.title;
+            }
         }
     }
 
@@ -271,7 +271,7 @@ async function dictionaryGroupsPopulate(options) {
     const dictGroups = $('#dict-groups').empty();
     const dictWarning = $('#dict-warning').hide();
 
-    const dictRows = await utilDatabaseGetTitles();
+    const dictRows = await utilDatabaseSummarize();
     if (dictRows.length === 0) {
         dictWarning.show();
     }
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 091137ed..216cef3f 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -75,16 +75,12 @@ function utilAnkiGetDeckNames() {
     return utilBackend().anki.getDeckNames();
 }
 
-function utilAnkiGetModelFieldNames(modelName) {
-    return utilBackend().anki.getModelFieldNames(modelName);
-}
-
-function utilDatabaseGetTitles() {
-    return utilBackend().translator.database.getTitles();
+function utilDatabaseSummarize() {
+    return utilBackend().translator.database.summarize();
 }
 
-function utilDatabaseGetTitlesWithSequences() {
-    return utilBackend().translator.database.getTitlesWithSequences();
+function utilAnkiGetModelFieldNames(modelName) {
+    return utilBackend().anki.getModelFieldNames(modelName);
 }
 
 function utilDatabasePurge() {
-- 
cgit v1.2.3


From d6603fd03155939ba98e8e74f98d1c5ce7ca9b0f Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 29 Oct 2017 10:59:50 -0700
Subject: include sequence property in header data

---
 ext/bg/js/database.js | 15 +++------------
 ext/bg/js/settings.js |  4 ++--
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 14b3243a..e63d95de 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -233,7 +233,7 @@ class Database {
             throw 'Database not initialized';
         }
 
-        const indexDataValid = async summary => {
+        const indexDataLoaded = async summary => {
             if (summary.version > 2) {
                 throw 'Unsupported dictionary version';
             }
@@ -242,9 +242,7 @@ class Database {
             if (count > 0) {
                 throw 'Dictionary is already imported';
             }
-        };
 
-        const indexDataLoaded = async summary => {
             await this.db.dictionaries.add(summary);
         };
 
@@ -282,8 +280,6 @@ class Database {
                 }
             }
 
-            summary.hasSequences = rows.every(row => row.sequence >= 0);
-
             await this.db.terms.bulkAdd(rows);
         };
 
@@ -381,7 +377,6 @@ class Database {
 
         return await Database.importDictionaryZip(
             archive,
-            indexDataValid,
             indexDataLoaded,
             termDataLoaded,
             termMetaDataLoaded,
@@ -393,7 +388,6 @@ class Database {
 
     static async importDictionaryZip(
         archive,
-        indexDataValid,
         indexDataLoaded,
         termDataLoaded,
         termMetaDataLoaded,
@@ -416,10 +410,11 @@ class Database {
         const summary = {
             title: index.title,
             revision: index.revision,
+            sequenced: index.sequenced,
             version: index.format || index.version
         };
 
-        await indexDataValid(summary);
+        await indexDataLoaded(summary);
 
         const buildTermBankName      = index => `term_bank_${index + 1}.json`;
         const buildTermMetaBankName  = index => `term_meta_bank_${index + 1}.json`;
@@ -476,10 +471,6 @@ class Database {
         await loadBank(summary, buildKanjiMetaBankName, kanjiMetaBankCount, kanjiMetaDataLoaded);
         await loadBank(summary, buildTagBankName, tagBankCount, tagDataLoaded);
 
-        if (indexDataLoaded) {
-            await indexDataLoaded(summary);
-        }
-
         return summary;
     }
 }
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 9d47f33c..9a7b20b6 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -110,7 +110,7 @@ async function formMainDictionaryOptionsPopulate(options) {
 
     let mainDictionary = '';
     for (const dictRow of await utilDatabaseSummarize()) {
-        if (dictRow.hasSequences) {
+        if (dictRow.sequenced) {
             select.append($(`<option value="${dictRow.title}">${dictRow.title}</option>`));
             if (dictRow.title === options.general.mainDictionary) {
                 mainDictionary = dictRow.title;
@@ -342,7 +342,7 @@ async function onDictionaryImport(e) {
         const options = await optionsLoad();
         const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
         options.dictionaries[summary.title] = {enabled: true, priority: 0, allowSecondarySearches: false};
-        if (summary.hasSequences && options.general.mainDictionary === '') {
+        if (summary.sequenced && options.general.mainDictionary === '') {
             options.general.mainDictionary = summary.title;
         }
         await optionsSave(options);
-- 
cgit v1.2.3


From c08dc6e00a0786438d785d3c7f62ce86205386fd Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 29 Oct 2017 12:20:56 -0700
Subject: add dictionary update nag screen

---
 ext/bg/js/database.js  |  2 +-
 ext/bg/js/settings.js  | 24 +++++++++++++++---------
 ext/bg/js/templates.js | 18 +++++++++++-------
 tmpl/dictionary.html   |  3 +++
 4 files changed, 30 insertions(+), 17 deletions(-)

(limited to 'ext/bg/js/settings.js')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index e63d95de..3c7f6aab 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -234,7 +234,7 @@ class Database {
         }
 
         const indexDataLoaded = async summary => {
-            if (summary.version > 2) {
+            if (summary.version > 3) {
                 throw 'Unsupported dictionary version';
             }
 
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 9a7b20b6..dcc9c43d 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -60,11 +60,11 @@ async function formRead() {
     optionsNew.general.mainDictionary = $('#dict-main').val();
     $('.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');
-        const allowSecondarySearches = dictionary.find('.dict-allow-secondary-searches').prop('checked');
-        optionsNew.dictionaries[title] = {priority, enabled, allowSecondarySearches};
+        optionsNew.dictionaries[dictionary.data('title')] = {
+            priority: parseInt(dictionary.find('.dict-priority').val(), 10),
+            enabled: dictionary.find('.dict-enabled').prop('checked'),
+            allowSecondarySearches: dictionary.find('.dict-allow-secondary-searches').prop('checked')
+        };
     });
 
     return {optionsNew, optionsOld};
@@ -277,14 +277,20 @@ async function dictionaryGroupsPopulate(options) {
     }
 
     for (const dictRow of dictRowsSort(dictRows, options)) {
-        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0, allowSecondarySearches: false};
+        const dictOptions = options.dictionaries[dictRow.title] || {
+            enabled: false,
+            priority: 0,
+            allowSecondarySearches: false
+        };
+
         const dictHtml = await apiTemplateRender('dictionary.html', {
+            enabled: dictOptions.enabled,
+            priority: dictOptions.priority,
+            allowSecondarySearches: dictOptions.allowSecondarySearches,
             title: dictRow.title,
             version: dictRow.version,
             revision: dictRow.revision,
-            priority: dictOptions.priority,
-            enabled: dictOptions.enabled,
-            allowSecondarySearches: dictOptions.allowSecondarySearches
+            outdated: dictRow.version < 3
         });
 
         dictGroups.append($(dictHtml));
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f3f680d5..680ec742 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -1,6 +1,8 @@
 (function() {
   var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
 templates['dictionary.html'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return "    <p class=\"text-warning\">This dictionary is outdated and may not support new extension features; please import the latest version.</p>\n";
+},"3":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 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
@@ -11,10 +13,12 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + 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)))
     + " <small>rev."
     + alias4(((helper = (helper = helpers.revision || (depth0 != null ? depth0.revision : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"revision","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n\n    <div class=\"checkbox\">\n        <label><input type=\"checkbox\" class=\"dict-enabled\" "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enabled : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</small></h4>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.outdated : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n    <div class=\"checkbox\">\n        <label><input type=\"checkbox\" class=\"dict-enabled\" "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enabled : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "> Enable search</label>\n    </div>\n    <div class=\"checkbox options-advanced\">\n        <label><input type=\"checkbox\" class=\"dict-allow-secondary-searches\" "
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.allowSecondarySearches : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.allowSecondarySearches : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "> Allow secondary searches</label>\n    </div>\n    <div class=\"form-group options-advanced\">\n        <label for=\"dict-"
     + 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)))
     + "\">Result priority</label>\n        <input type=\"number\" value=\""
@@ -310,19 +314,19 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
   return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.expressions : depth0),{"name":"each","hash":{},"fn":container.program(29, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"29":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", buffer = 
-  "<div class=\"expression\"><!--\n     --><span class=\"expression-"
+  "<div class=\"expression\">\n        <span class=\"expression-"
     + container.escapeExpression(((helper = (helper = helpers.termFrequency || (depth0 != null ? depth0.termFrequency : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"termFrequency","hash":{},"data":data}) : helper)))
     + "\">";
   stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(30, data, 0, blockParams, depths),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
-  return buffer + "</span><!--\n     --><div class=\"peek-wrapper\">"
+  return buffer + "</span>\n        <div class=\"peek-wrapper\">"
     + ((stack1 = helpers["if"].call(alias1,(depths[1] != null ? depths[1].playback : depths[1]),{"name":"if","hash":{},"fn":container.program(33, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.termTags : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</div><!--\n     --><span class=\""
+    + "</div>\n        <span class=\""
     + ((stack1 = helpers["if"].call(alias1,(data && data.last),{"name":"if","hash":{},"fn":container.program(41, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\">、</span><!--\n --></div>";
+    + "\">、</span>\n    </div>";
 },"30":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options;
 
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 1dc04f0f..61bb79ac 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,5 +1,8 @@
 <div class="dict-group well well-sm" data-title="{{title}}">
     <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>rev.{{revision}}</small></h4>
+    {{#if outdated}}
+    <p class="text-warning">This dictionary is outdated and may not support new extension features; please import the latest version.</p>
+    {{/if}}
 
     <div class="checkbox">
         <label><input type="checkbox" class="dict-enabled" {{#if enabled}}checked{{/if}}> Enable search</label>
-- 
cgit v1.2.3