Merge pull request #459 from janekptacijarabaci/pm_findbar_2

[PALEMOON] Fix the Findbar - open when you press "/" or "'" keys after start of browser

1 files changed, 63 insertions, 0 deletions

diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index a51b73fe8..ba791f709 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -328,6 +328,67 @@ const gSessionHistoryObserver = {
   }
 };
 
+var gFindBarSettings = {
+  messageName: "Findbar:Keypress",
+  prefName: "accessibility.typeaheadfind",
+  findAsYouType: null,
+
+  init: function() {
+    window.messageManager.addMessageListener(this.messageName, this);
+
+    gPrefService.addObserver(this.prefName, this, false);
+    this.writeFindAsYouType();
+  },
+
+  uninit: function() {
+    window.messageManager.removeMessageListener(this.messageName, this);
+
+    try {
+      gPrefService.removeObserver(this.prefName, this);
+    } catch (ex) {
+      Cu.reportError(ex);
+    }
+  },
+
+  observe: function(aSubject, aTopic, aData) {
+    if (aTopic != "nsPref:changed") {
+      return;
+    }
+
+    this.writeFindAsYouType();
+  },
+
+  writeFindAsYouType: function() {
+    this.findAsYouType = gPrefService.getBoolPref(this.prefName);
+  },
+
+  receiveMessage: function(aMessage) {
+    switch (aMessage.name) {
+      case this.messageName:
+        // If the find bar for chrome window's context is not yet alive,
+        // only initialize it if there's a possibility FindAsYouType
+        // will be used.
+        // There's no point in doing it for most random keypresses.
+        if (!gFindBarInitialized && aMessage.data.shouldFastFind) {
+          let shouldFastFind = this.findAsYouType;
+          if (!shouldFastFind) {
+            // Please keep in sync with toolkit/content/widgets/findbar.xml
+            const FAYT_LINKS_KEY = "'";
+            const FAYT_TEXT_KEY = "/";
+            let charCode = aMessage.data.fakeEvent.charCode;
+            let key = charCode ? String.fromCharCode(charCode) : null;
+            shouldFastFind = key == FAYT_LINKS_KEY || key == FAYT_TEXT_KEY;
+          }
+          if (shouldFastFind) {
+            // Make sure we return the result.
+            return gFindBar.receiveMessage(aMessage);
+          }
+        }
+        break;
+    }
+  }
+};
+
 var gURLBarSettings = {
   prefSuggest: "browser.urlbar.suggest.",
   /*
@@ -730,6 +791,7 @@ var gBrowserInit = {
 #ifdef MOZ_DEVTOOLS
     DevToolsTheme.init();
 #endif
+    gFindBarSettings.init();
 
     messageManager.loadFrameScript("chrome://browser/content/content.js", true);
     messageManager.loadFrameScript("chrome://browser/content/content-sessionStore.js", true);
@@ -1305,6 +1367,7 @@ var gBrowserInit = {
 #ifdef MOZ_DEVTOOLS
     DevToolsTheme.uninit();
 #endif
+    gFindBarSettings.uninit();
 
     UserAgentCompatibility.uninit();