[Pkg-mozext-commits] [adblock-plus] 20/41: Reverted changeset 5d9ac641466b (Issue 2041 - Filter Preferences: Findbar not fully functional in Firefox 36) - accidentially pushed before review was done
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 18:21:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 01e04de3edae6b877e9c99e5d10cf00f20cc6290
Author: Wladimir Palant <trev at adblockplus.org>
Date: Fri Feb 27 16:39:56 2015 +0100
Reverted changeset 5d9ac641466b (Issue 2041 - Filter Preferences: Findbar not fully functional in Firefox 36) - accidentially pushed before review was done
---
chrome/content/ui/filters-search.js | 76 ++++++++++++++++++++++++++++++-------
metadata.gecko | 10 ++---
2 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/chrome/content/ui/filters-search.js b/chrome/content/ui/filters-search.js
index 2d0c0cf..e6381ed 100644
--- a/chrome/content/ui/filters-search.js
+++ b/chrome/content/ui/filters-search.js
@@ -26,20 +26,8 @@ var FilterSearch =
*/
init: function()
{
- let filters = E("filtersTree");
- for (let prop in FilterSearch.fakeBrowser)
- filters[prop] = FilterSearch.fakeBrowser[prop];
- Object.defineProperty(filters, "_lastSearchString", {
- get: function()
- {
- return this.finder.searchString;
- },
- enumerable: true,
- configurable: true
- });
-
let findbar = E("findbar");
- findbar.browser = filters;
+ findbar.browser = FilterSearch.fakeBrowser;
findbar.addEventListener("keypress", function(event)
{
@@ -215,6 +203,57 @@ FilterSearch.fakeBrowser =
keyPress: function() {}
},
+ get _lastSearchString()
+ {
+ return this.finder.searchString;
+ },
+
+ // This was used before Firefox 27 instead of the "finder" property.
+ fastFind:
+ {
+ get searchString()
+ {
+ return FilterSearch.fakeBrowser.finder.searchString;
+ },
+
+ set searchString(searchString)
+ {
+ FilterSearch.fakeBrowser.finder.searchString = searchString;
+ },
+
+ foundLink: null,
+ foundEditable: null,
+
+ get caseSensitive()
+ {
+ return FilterSearch.fakeBrowser.finder.caseSensitive;
+ },
+
+ set caseSensitive(caseSensitive)
+ {
+ FilterSearch.fakeBrowser.finder.caseSensitive = caseSensitive;
+ },
+
+ get currentWindow() FilterSearch.fakeBrowser.contentWindow,
+
+ find: function(searchString, linksOnly)
+ {
+ FilterSearch.fakeBrowser.finder.fastFind(searchString, linksOnly);
+ return FilterSearch.fakeBrowser.finder.lastResult;
+ },
+
+ findAgain: function(findBackwards, linksOnly)
+ {
+ FilterSearch.fakeBrowser.finder.findAgain(findBackwards, linksOnly);
+ return FilterSearch.fakeBrowser.finder.lastResult;
+ },
+
+ // Irrelevant for us
+ init: function() {},
+ setDocShell: function() {},
+ setSelectionModeAndRepaint: function() {},
+ collapseSelection: function() {}
+ },
currentURI: Utils.makeURI("http://example.com/"),
contentWindow:
{
@@ -230,7 +269,16 @@ FilterSearch.fakeBrowser =
{
E("filtersTree").boxObject.scrollByPages(num);
},
- }
+ },
+
+ addEventListener: function(event, handler, capture)
+ {
+ E("filtersTree").addEventListener(event, handler, capture);
+ },
+ removeEventListener: function(event, handler, capture)
+ {
+ E("filtersTree").addEventListener(event, handler, capture);
+ },
};
window.addEventListener("load", function()
diff --git a/metadata.gecko b/metadata.gecko
index 2e39c02..638b7a8 100644
--- a/metadata.gecko
+++ b/metadata.gecko
@@ -29,11 +29,11 @@ zh-CN=https://adblockplus.org/zh_CN/
zh-TW=https://adblockplus.org/zh_TW/
[compat]
-firefox=26.0/39.0
-fennec2=26.0/39.0
-thunderbird=26.0/39.0
-seamonkey=2.23/2.36
-toolkit=26.0/39.0
+firefox=25.0/39.0
+fennec2=25.0/39.0
+thunderbird=25.0/39.0
+seamonkey=2.22/2.36
+toolkit=25.0/39.0
[mapping]
chrome/content/ui/firstRun.html = adblockplusui/firstRun.html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list