зеркало из https://github.com/mozilla/gecko-dev.git
Bug 396241 - "nsIIOService.newURI exception in makeURI in contentAreaUtils.js when doing open Frame in New Tab with data url" [p=f.qu@queze.net (Florian Quèze) r=Mano a1.9=mconnor]
This commit is contained in:
Родитель
592f6d00f9
Коммит
e66675cbb7
|
@ -641,8 +641,10 @@ nsContextMenu.prototype = {
|
||||||
openFrameInTab: function() {
|
openFrameInTab: function() {
|
||||||
var doc = this.target.ownerDocument;
|
var doc = this.target.ownerDocument;
|
||||||
var frameURL = doc.documentURIObject.spec;
|
var frameURL = doc.documentURIObject.spec;
|
||||||
|
var referrer = doc.referrer;
|
||||||
|
|
||||||
openNewTabWith(frameURL, null, null, null, false, makeURI(doc.referrer));
|
openNewTabWith(frameURL, null, null, null, false,
|
||||||
|
referrer ? makeURI(referrer) : null);
|
||||||
},
|
},
|
||||||
|
|
||||||
// Reload clicked-in frame.
|
// Reload clicked-in frame.
|
||||||
|
@ -654,8 +656,10 @@ nsContextMenu.prototype = {
|
||||||
openFrame: function() {
|
openFrame: function() {
|
||||||
var doc = this.target.ownerDocument;
|
var doc = this.target.ownerDocument;
|
||||||
var frameURL = doc.documentURIObject.spec;
|
var frameURL = doc.documentURIObject.spec;
|
||||||
|
var referrer = doc.referrer;
|
||||||
|
|
||||||
openNewWindowWith(frameURL, null, null, false, makeURI(doc.referrer));
|
openNewWindowWith(frameURL, null, null, false,
|
||||||
|
referrer ? makeURI(referrer) : null);
|
||||||
},
|
},
|
||||||
|
|
||||||
// Open clicked-in frame in the same window.
|
// Open clicked-in frame in the same window.
|
||||||
|
@ -665,7 +669,8 @@ nsContextMenu.prototype = {
|
||||||
|
|
||||||
urlSecurityCheck(frameURL, this.browser.contentPrincipal,
|
urlSecurityCheck(frameURL, this.browser.contentPrincipal,
|
||||||
Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
|
Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
|
||||||
this.browser.loadURI(frameURL, makeURI(doc.referrer));
|
var referrer = doc.referrer;
|
||||||
|
this.browser.loadURI(frameURL, referrer ? makeURI(referrer) : null);
|
||||||
},
|
},
|
||||||
|
|
||||||
// View Partial Source
|
// View Partial Source
|
||||||
|
|
Загрузка…
Ссылка в новой задаче