Issue 3129/3144 - Fixed: Findbar key handling conflicted with filter editing

chrome/content/ui/filters-search.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+let {BrowserUtils} = Cu.import("resource://gre/modules/BrowserUtils.jsm");
+
 /**
  * Implementation of the filter search functionality.
  * @class
  */
 var FilterSearch =
 {
   /**
    * Initializes findbar widget.
    */
   init: function()
@@ skipping 199 matching lines @@
       E("filtersTree").boxObject.scrollByLines(num);
     },
     scrollByPages: function(num)
     {
       E("filtersTree").boxObject.scrollByPages(num);
     },
   },
 
   messageManager:
   {
+    FAYT_LINKS_KEY: "'".charCodeAt(0),
+    FAYT_TEXT_KEY: "/".charCodeAt(0),
     _messageMap: {
       "Findbar:Mouseup": "mouseup",
       "Findbar:Keypress": "keypress"
     },
 
     _messageFromEvent: function(event)
     {
       for (let message in this._messageMap)
         if (this._messageMap[message] == event.type)
           return {target: event.currentTarget, name: message, data: event};
       return null;
     },
 
     addMessageListener: function(message, listener)
     {
       if (!this._messageMap.hasOwnProperty(message))
         return;
 
       if (!("_ABPHandler" in listener))
-        listener._ABPHandler = (event) => listener.receiveMessage(this._messageFromEvent(event));
+      {
+        listener._ABPHandler = (event) => {
+          if (event.type == "keypress")
+          {
+            if (event.ctrlKey || event.altKey || event.metaKey
+              || event.defaultPrevented)
+              return;
+
+            let findbar = E("findbar");
+            if (findbar.findMode == findbar.FIND_NORMAL
+              && !findbar.findAsYouType
+              && event.charCode != this.FAYT_LINKS_KEY
+              && event.charCode != this.FAYT_TEXT_KEY)
+              return;
+
+            let target = Services.focus.getFocusedElementForWindow(window, true, {});
+            if (!BrowserUtils.shouldFastFind(target, window))
+              return;
+          }
+
+          listener.receiveMessage(this._messageFromEvent(event));
+        };
+      }
 
       E("filtersTree").addEventListener(this._messageMap[message], listener._ABPHandler, false);
     },
 
     removeMessageListener: function(message, listener)
     {
       if (this._messageMap.hasOwnProperty(message) && listener._ABPHandler)
         E("filtersTree").removeEventListener(this._messageMap[message], listener._ABPHandler, false);
     },
 
     sendAsyncMessage: function() {}
   }
 };
 
 window.addEventListener("load", function()
 {
   FilterSearch.init();
 }, false);