corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1039904 - Changing the URL in a pinned tab shouldn't open a new tab. r=gavin

Browse Source
This commit is contained in:
Dão Gottwald
2014-08-01 18:20:57 +02:00
parent b76679442f
commit d80f95d5a2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/urlbarBindings.xml
View File

@@ -317,6 +317,7 @@
openUILinkIn(url, "current", { openUILinkIn(url, "current", {
allowThirdPartyFixup: true, allowThirdPartyFixup: true,
disallowInheritPrincipal: !mayInheritPrincipal, disallowInheritPrincipal: !mayInheritPrincipal,
allowPinnedTabHostChange: true,
postData: postData postData: postData
}); });
} }

5
browser/base/content/utilityOverlay.js
View File

@@ -185,6 +185,7 @@ function whereToOpenLink( e, ignoreButton, ignoreAlt )
* referrerURI (nsIURI) * referrerURI (nsIURI)
* relatedToCurrent (boolean) * relatedToCurrent (boolean)
* skipTabAnimation (boolean) * skipTabAnimation (boolean)
* allowPinnedTabHostChange (boolean)
*/ */
function openUILinkIn(url, where, aAllowThirdPartyFixup, aPostData, aReferrerURI) { function openUILinkIn(url, where, aAllowThirdPartyFixup, aPostData, aReferrerURI) {
var params; var params;
@@ -220,6 +221,7 @@ function openLinkIn(url, where, params) {
var aInitiatingDoc = params.initiatingDoc; var aInitiatingDoc = params.initiatingDoc;
var aIsPrivate = params.private; var aIsPrivate = params.private;
var aSkipTabAnimation = params.skipTabAnimation; var aSkipTabAnimation = params.skipTabAnimation;
var aAllowPinnedTabHostChange = !!params.allowPinnedTabHostChange;
if (where == "save") { if (where == "save") {
if (!aInitiatingDoc) { if (!aInitiatingDoc) {
@@ -288,7 +290,8 @@ function openLinkIn(url, where, params) {
} catch (e) {} } catch (e) {}
} }
if (where == "current" && w.gBrowser.selectedTab.pinned) { if (where == "current" && w.gBrowser.selectedTab.pinned &&
!aAllowPinnedTabHostChange) {
try { try {
// nsIURI.host can throw for non-nsStandardURL nsIURIs. // nsIURI.host can throw for non-nsStandardURL nsIURIs.
if (!uriObj || (!uriObj.schemeIs("javascript") && if (!uriObj || (!uriObj.schemeIs("javascript") &&