Merge branch 'hotfix-1.13.11'

* hotfix-1.13.11: Update version info. fulltext: support form history for Firefox >= 54
danny0838 · Jun 2, 2017 · 9bf5d72 · 9bf5d72
2 parents b975ba0 + 75f791b
commit 9bf5d72
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 5 deletions.
diff --git a/chrome/content/scrapbook/scrapbook.js b/chrome/content/scrapbook/scrapbook.js
@@ -553,8 +553,16 @@ var sbSearchService = {
 
     get ELEMENT() { return document.getElementById("sbSearchImage"); },
     get FORM_HISTORY() {
-        return Components.classes["@mozilla.org/satchel/form-history;1"]
-               .getService(Components.interfaces.nsIFormHistory2 || Components.interfaces.nsIFormHistory);
+        try {
+            // Firefox >= ?
+            Components.utils.import("resource://gre/modules/FormHistory.jsm");
+            var result = FormHistory;
+        } catch (ex) {
+            // not available in Firefox >= 54
+            var result = Components.classes["@mozilla.org/satchel/form-history;1"]
+                    .getService(Components.interfaces.nsIFormHistory2 || Components.interfaces.nsIFormHistory);
+        }
+        return this.FORM_HISTORY = result;
     },
 
     type: "",
@@ -601,7 +609,7 @@ var sbSearchService = {
             var query = aInput;
             var re = document.getElementById("sbSearchPopupOptionRE").getAttribute("checked");
             var mc = document.getElementById("sbSearchPopupOptionCS").getAttribute("checked");
-            this.FORM_HISTORY.addEntry("sbSearchHistory", query);
+            this.addFormHistory(query);
             if (this.type == "fulltext") {
                 this.doFullTextSearch(query, re, mc);
             } else {
@@ -722,8 +730,32 @@ var sbSearchService = {
         sbDataSource.clearContainer("urn:scrapbook:search");
     },
 
+    addFormHistory: function(query) {
+        if (this.FORM_HISTORY.update) {
+            this.FORM_HISTORY.update({
+                op: "remove",
+                fieldname: "sbSearchHistory",
+                value: query
+            });
+            this.FORM_HISTORY.update({
+                op: "add",
+                fieldname: "sbSearchHistory",
+                value: query
+            });
+        } else {
+            this.FORM_HISTORY.addEntry("sbSearchHistory", query);
+        }
+    },
+
     clearFormHistory: function() {
-        this.FORM_HISTORY.removeEntriesForName("sbSearchHistory");
+        if (this.FORM_HISTORY.update) {
+            this.FORM_HISTORY.update({
+                op: "remove",
+                fieldname: "sbSearchHistory"
+            });
+        } else {
+            this.FORM_HISTORY.removeEntriesForName("sbSearchHistory");
+        }
     },
 };
 
@@ -1060,3 +1092,4 @@ window.addEventListener("SidebarFocused", function () {
 }, false);
 
 
+
diff --git a/doc/releases/1.13.11.txt b/doc/releases/1.13.11.txt
@@ -0,0 +1,7 @@
+Scrapbook X 1.13.11
+===================
+
+Changes since v1.13.10
+----------------------
+
+ * Fixed an issue that fulltext search does not work in Firefox >= 54.
diff --git a/install.rdf b/install.rdf
@@ -6,7 +6,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>[email protected]</em:id>
         <em:type>2</em:type>
-        <em:version>1.13.10</em:version>
+        <em:version>1.13.11</em:version>
         <em:unpack>false</em:unpack>
         <em:bootstrap>false</em:bootstrap>
         <em:multiprocessCompatible>false</em:multiprocessCompatible>