Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out bug 423833 due to windows browser test failures

Browse Source
This commit is contained in:
johnath@mozilla.com 2008-04-07 07:56:44 -07:00
parent 56af4e3787
commit 2440f082b5
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/base/content/nsContextMenu.js
View File

@ -654,11 +654,11 @@ nsContextMenu.prototype = {
// Open frame in a new tab.
openFrameInTab: function() {
var doc = this.target.ownerDocument;
var frameURL = doc.location.href;
var frameURL = doc.documentURIObject.spec;
var referrer = doc.referrer;
return openNewTabWith(frameURL, null, null, null, false,
referrer ? makeURI(referrer) : null);
openNewTabWith(frameURL, null, null, null, false,
referrer ? makeURI(referrer) : null);
},
// Reload clicked-in frame.
@ -669,17 +669,17 @@ nsContextMenu.prototype = {
// Open clicked-in frame in its own window.
openFrame: function() {
var doc = this.target.ownerDocument;
var frameURL = doc.location.href;
var frameURL = doc.documentURIObject.spec;
var referrer = doc.referrer;
return openNewWindowWith(frameURL, null, null, false,
referrer ? makeURI(referrer) : null);
openNewWindowWith(frameURL, null, null, false,
referrer ? makeURI(referrer) : null);
},
// Open clicked-in frame in the same window.
showOnlyThisFrame: function() {
var doc = this.target.ownerDocument;
var frameURL = doc.location.href;
var frameURL = doc.documentURIObject.spec;
urlSecurityCheck(frameURL, this.browser.contentPrincipal,
Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);

1
browser/base/content/test/Makefile.in
View File

@ -54,7 +54,6 @@ _BROWSER_FILES = browser_bug321000.js \
browser_bug409481.js \
browser_autodiscovery.js \
browser_bug420160.js \
browser_bug423833.js \
autodiscovery.html \
moz.png \
browser_getshortcutoruri.js \

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

@ -578,8 +578,8 @@ function openNewTabWith(aURL, aDocument, aPostData, aEvent,
// open link in new tab
var referrerURI = aDocument ? aDocument.documentURIObject : aReferrer;
var browser = top.document.getElementById("content");
return browser.loadOneTab(aURL, referrerURI, originCharset, aPostData,
loadInBackground, aAllowThirdPartyFixup || false);
browser.loadOneTab(aURL, referrerURI, originCharset, aPostData,
loadInBackground, aAllowThirdPartyFixup || false);
}
function openNewWindowWith(aURL, aDocument, aPostData, aAllowThirdPartyFixup,
@ -598,9 +598,9 @@ function openNewWindowWith(aURL, aDocument, aPostData, aAllowThirdPartyFixup,
charsetArg = "charset=" + window.content.document.characterSet;
var referrerURI = aDocument ? aDocument.documentURIObject : aReferrer;
return window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no",
aURL, charsetArg, referrerURI, aPostData,
aAllowThirdPartyFixup);
window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no",
aURL, charsetArg, referrerURI, aPostData,
aAllowThirdPartyFixup);
}
/**