diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-09 08:24:54 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-09 08:24:54 +0200 |
| commit | b1a98da75325c6b57129becf9027dccf7424c1c0 (patch) | |
| tree | 25f71a5b6aee6d4e326298643ae798de7d18ce90 /toolkit/content | |
| parent | 95835c0acc5856aa56574a612549e2fb40260984 (diff) | |
| download | UXP-b1a98da75325c6b57129becf9027dccf7424c1c0.tar UXP-b1a98da75325c6b57129becf9027dccf7424c1c0.tar.gz UXP-b1a98da75325c6b57129becf9027dccf7424c1c0.tar.lz UXP-b1a98da75325c6b57129becf9027dccf7424c1c0.tar.xz UXP-b1a98da75325c6b57129becf9027dccf7424c1c0.zip | |
Revert "[PALEMOON] Findbar - remove unnecessary code (Findbar is no longer in the gBrowser)"
This reverts commit 38f30cdf759e4f6da96da777c3216b5047d672c1.
Diffstat (limited to 'toolkit/content')
| -rw-r--r-- | toolkit/content/browser-content.js | 29 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js index 2276f8a0d..e1114672c 100644 --- a/toolkit/content/browser-content.js +++ b/toolkit/content/browser-content.js @@ -841,6 +841,35 @@ 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 e1d432cb3..c11d3abed 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 |