Issue 455 - Find function in Filter Preferences - No indication when keyword is not found

chrome/content/ui/filters-search.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
@@ skipping 126 matching lines @@
   finder:
   {
     _resultListeners: [],
     searchString: null,
     caseSensitive: false,
     lastResult: null,
 
     _notifyResultListeners: function(result, findBackwards)
     {
       this.lastResult = result;
-      for each (let listener in this._resultListeners)
-        listener.onFindResult(result, findBackwards);
+      for (let listener of this._resultListeners)
+      {
+        // See https://bugzilla.mozilla.org/show_bug.cgi?id=958101, starting
+        // with Gecko 29 only one parameter is expected.
+        try
+        {
+          if (listener.onFindResult.length == 1)
+          {
+            listener.onFindResult({searchString: this.searchString,
+                result: result, findBackwards: findBackwards});
+          }
+          else
+            listener.onFindResult(result, findBackwards);
+        }
+        catch (e)
+        {
+          Cu.reportError(e);
+        }
+      }
     },
 
     fastFind: function(searchString, linksOnly, drawOutline)
     {
       this.searchString = searchString;
       let result = FilterSearch.search(this.searchString, 0,
                                        this.caseSensitive);
       this._notifyResultListeners(result, false);
     },
 
@@ skipping 12 matching lines @@
     },
 
     removeResultListener: function(listener)
     {
       let index = this._resultListeners.indexOf(listener);
       if (index !== -1)
         this._resultListeners.splice(index, 1);
     },
 
     // Irrelevant for us
+    requestMatchesCount: function(searchString, matchLimit, linksOnly) {},
     highlight: function(highlight, word) {},
     enableSelection: function() {},
     removeSelection: function() {},
     focusContent: function() {},
     keyPress: function() {}
   },
 
   get _lastSearchString()
   {
     return this.finder.searchString;
@@ skipping 69 matching lines @@
   removeEventListener: function(event, handler, capture)
   {
     E("filtersTree").addEventListener(event, handler, capture);
   },
 };
 
 window.addEventListener("load", function()
 {
   FilterSearch.init();
 }, false);