Merge branch 'master' into testing

5 files changed, 14 insertions, 7 deletions

diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 00b7ca4b..fe48773f 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -224,6 +224,7 @@ class DisplaySearch extends Display {
                     sentence: {text: query, offset: 0},
                     url: window.location.href
                 });
+                this.setTitleText(query);
             } else {
                 this.container.textContent = '';
             }
@@ -356,6 +357,14 @@ class DisplaySearch extends Display {
         this.search.disabled = this.introVisible && (this.query === null || this.query.value.length === 0);
     }
 
+    setTitleText(text) {
+        // Chrome limits title to 1024 characters
+        if (text.length > 1000) {
+            text = text.slice(0, 1000) + '...';
+        }
+        document.title = `${text} - Yomichan Search`;
+    }
+
     static getSearchQueryFromLocation(url) {
         const match = /^[^?#]*\?(?:[^&#]*&)?query=([^&#]*)/.exec(url);
         return match !== null ? decodeURIComponent(match[1]) : null;
diff --git a/ext/bg/search.html b/ext/bg/search.html
index fef30456..58bb9ba8 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -69,7 +69,6 @@
         <script src="/fg/js/api.js"></script>
         <script src="/fg/js/document.js"></script>
         <script src="/fg/js/source.js"></script>
-        <script src="/fg/js/util.js"></script>
         <script src="/mixed/js/audio.js"></script>
         <script src="/mixed/js/display-context.js"></script>
         <script src="/mixed/js/display.js"></script>
diff --git a/ext/fg/float.html b/ext/fg/float.html
index 8cc5a129..67ee50b4 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -35,7 +35,6 @@
         <script src="/mixed/js/dom.js"></script>
 
         <script src="/fg/js/api.js"></script>
-        <script src="/fg/js/util.js"></script>
         <script src="/fg/js/document.js"></script>
         <script src="/fg/js/source.js"></script>
         <script src="/mixed/js/audio.js"></script>
diff --git a/ext/manifest.json b/ext/manifest.json
index 07343822..8e6a063a 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Yomichan (testing)",
-    "version": "2.0.0",
+    "version": "2.0.1",
 
     "description": "Japanese dictionary with Anki integration (testing)",
     "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index c32852ad..7d5e4e7d 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -354,8 +354,8 @@ class Display {
             const sequence = ++this.sequence;
             const params = {
                 definitions,
-                source: this.context.previous,
-                next: this.context.next,
+                source: !!this.context.previous,
+                next: !!this.context.next,
                 addable: options.anki.enable,
                 grouped: options.general.resultOutputMode === 'group',
                 merged: options.general.resultOutputMode === 'merge',
@@ -415,8 +415,8 @@ class Display {
             const sequence = ++this.sequence;
             const params = {
                 definitions,
-                source: this.context.previous,
-                next: this.context.next,
+                source: !!this.context.previous,
+                next: !!this.context.next,
                 addable: options.anki.enable,
                 debug: options.general.debugInfo
             };