diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-03 22:55:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-03 22:55:42 +0200 |
| commit | bf11fdd304898ac675e39b01b280d39550e419d0 (patch) | |
| tree | 1fec353f59754401cb28e8d9edff8ea38209765e /toolkit | |
| parent | 88e05fc523ec7a2c366b0e7831991efee538566c (diff) | |
| parent | 8844b141bfbe9d1620d60b5fde4225124409585c (diff) | |
| download | uxp-bf11fdd304898ac675e39b01b280d39550e419d0.tar.gz | |
Merge pull request #441 from janekptacijarabaci/pm_findbar_1
[PALEMOON] Fix the Findbar - open when you press "/" or "'" keys
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/content/browser-content.js | 30 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 6 |
2 files changed, 33 insertions, 3 deletions
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js index b392aaf880..e1114672c1 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 f0d4a62a4f..72a7952c4f 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 |