diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-18 13:18:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 13:18:16 +0200 |
| commit | 4ee1656d4a0721d31039508e0d0abc79e3f38c8d (patch) | |
| tree | c0526cab62e4bb7e622b401753b4f9a7c5c96cd9 /toolkit | |
| parent | d608016c32ae4627adb7d7c460e7251d606514c6 (diff) | |
| parent | 63b10a9b4f8644550a89022b8d0d53ee26fc150b (diff) | |
| download | UXP-4ee1656d4a0721d31039508e0d0abc79e3f38c8d.tar UXP-4ee1656d4a0721d31039508e0d0abc79e3f38c8d.tar.gz UXP-4ee1656d4a0721d31039508e0d0abc79e3f38c8d.tar.lz UXP-4ee1656d4a0721d31039508e0d0abc79e3f38c8d.tar.xz UXP-4ee1656d4a0721d31039508e0d0abc79e3f38c8d.zip | |
Merge pull request #514 from janekptacijarabaci/pm_findbar_4
[PALEMOON] Fix Findbar: The context menu - "View Page Source"
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/content/browser-content.js | 29 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 2 |
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 a5db7e3a1..acec1bdf1 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -37,7 +37,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 |