summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-06-03 20:11:54 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-06-03 20:11:54 +0200
commit8844b141bfbe9d1620d60b5fde4225124409585c (patch)
tree6c2edc7322b7479a660b2e6c11de56bff0dd0bfe /toolkit
parent13168ba15b63ccdd4b34e0a20bcb4deb37ab29f3 (diff)
downloadUXP-8844b141bfbe9d1620d60b5fde4225124409585c.tar
UXP-8844b141bfbe9d1620d60b5fde4225124409585c.tar.gz
UXP-8844b141bfbe9d1620d60b5fde4225124409585c.tar.lz
UXP-8844b141bfbe9d1620d60b5fde4225124409585c.tar.xz
UXP-8844b141bfbe9d1620d60b5fde4225124409585c.zip
[PALEMOON] Fix the Findbar - open when you press "/" or "'" keys
Issue #430
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/content/browser-content.js30
-rw-r--r--toolkit/content/jar.mn6
2 files changed, 33 insertions, 3 deletions
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index b392aaf88..e1114672c 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -841,6 +841,36 @@ var FindBar = {
fakeEvent[k] = event[k];
}
}
+#ifdef MC_PALEMOON
+ let findBarId = "FindToolbar";
+ // The FindBar is in the chrome window's context, not in tabbrowser
+ // - see also bug 537013
+ let chromeWin = null;
+ try {
+ chromeWin = content
+ .QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIWebNavigation)
+ .QueryInterface(Ci.nsIDocShellTreeItem)
+ .rootTreeItem
+ .QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIDOMWindow)
+ .QueryInterface(Ci.nsIDOMChromeWindow);
+ } catch (e) {
+ Cu.reportError(
+ "The FindBar - the chrome window's context was not detected:\n" + e);
+ }
+ if (chromeWin && chromeWin.document.getElementById(findBarId)) {
+ try {
+ chromeWin.document.getElementById(findBarId)
+ .browser = Services.wm.getMostRecentWindow("navigator:browser")
+ .gBrowser.mCurrentBrowser;
+ } catch (e) {
+ Cu.reportError(
+ "The FindBar - cannot set the property 'browser':\n" + e);
+ }
+ }
+#endif
+
// sendSyncMessage returns an array of the responses from all listeners
let rv = sendSyncMessage("Findbar:Keypress", {
fakeEvent: fakeEvent,
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index f0d4a62a4..72a7952c4 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -37,8 +37,8 @@ toolkit.jar:
content/global/plugins.html
content/global/plugins.css
content/global/browser-child.js
- content/global/browser-content.js
-* content/global/buildconfig.html
+* content/global/browser-content.js
+* content/global/buildconfig.html
content/global/contentAreaUtils.js
#ifndef MOZ_FENNEC
content/global/customizeToolbar.css
@@ -56,7 +56,7 @@ toolkit.jar:
content/global/filepicker.properties
content/global/globalOverlay.js
content/global/memoriam.xhtml
-* content/global/mozilla.css
+* content/global/mozilla.css
content/global/mozilla.xhtml
#ifdef MOZ_PHOENIX
content/global/logopage.xhtml