summaryrefslogtreecommitdiffstats
path: root/toolkit/content
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-06-18 12:21:11 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-11-14 13:48:56 +0100
commit16e5a6bc2b4e3694afdd865660b00be64578fa89 (patch)
tree1179f59769da15b8bf22805272df8db848ddff2d /toolkit/content
parentb199e3aa094ce1408509e68a1e0eed937fad7ab4 (diff)
downloadUXP-16e5a6bc2b4e3694afdd865660b00be64578fa89.tar
UXP-16e5a6bc2b4e3694afdd865660b00be64578fa89.tar.gz
UXP-16e5a6bc2b4e3694afdd865660b00be64578fa89.tar.lz
UXP-16e5a6bc2b4e3694afdd865660b00be64578fa89.tar.xz
UXP-16e5a6bc2b4e3694afdd865660b00be64578fa89.zip
[PALEMOON] Re-apply removal of unnecessary code (Findbar is no longer in the gBrowser)
This resolves #793
Diffstat (limited to 'toolkit/content')
-rw-r--r--toolkit/content/browser-content.js29
-rw-r--r--toolkit/content/jar.mn2
2 files changed, 1 insertions, 30 deletions
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index e1114672c..2276f8a0d 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -841,35 +841,6 @@ 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", {
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index c11d3abed..e1d432cb3 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -39,7 +39,7 @@ toolkit.jar:
content/global/plugins.html
content/global/plugins.css
content/global/browser-child.js
-* content/global/browser-content.js
+ content/global/browser-content.js
* content/global/buildconfig.html
content/global/contentAreaUtils.js
#ifndef MOZ_FENNEC