mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-05 06:47:31 +09:00
Merge remote-tracking branch 'origin/master' into custom
This commit is contained in:
commit
8495414910
53 changed files with 351 additions and 1527 deletions
|
|
@ -4481,14 +4481,15 @@ nsBrowserAccess.prototype = {
|
|||
}
|
||||
|
||||
let loadInBackground = gPrefService.getBoolPref("browser.tabs.loadDivertedInBackground");
|
||||
let referrer = aOpener ? makeURI(aOpener.location.href) : null;
|
||||
let openerWindow = (aContext & Ci.nsIBrowserDOMWindow.OPEN_NO_OPENER) ? null : aOpener;
|
||||
|
||||
let tab = win.gBrowser.loadOneTab(aURI ? aURI.spec : "about:blank", {
|
||||
triggeringPrincipal: triggeringPrincipal,
|
||||
referrerURI: referrer,
|
||||
referrerPolicy: referrerPolicy,
|
||||
fromExternal: isExternal,
|
||||
inBackground: loadInBackground});
|
||||
inBackground: loadInBackground,
|
||||
opener: openerWindow });
|
||||
let browser = win.gBrowser.getBrowserForTab(tab);
|
||||
|
||||
if (gPrefService.getBoolPref("browser.tabs.noWindowActivationOnExternal")) {
|
||||
|
|
|
|||
|
|
@ -1339,6 +1339,7 @@
|
|||
var aFromExternal;
|
||||
var aRelatedToCurrent;
|
||||
var aOriginPrincipal;
|
||||
var aOpener;
|
||||
if (arguments.length == 2 &&
|
||||
typeof arguments[1] == "object" &&
|
||||
!(arguments[1] instanceof Ci.nsIURI)) {
|
||||
|
|
@ -1353,6 +1354,7 @@
|
|||
aFromExternal = params.fromExternal;
|
||||
aRelatedToCurrent = params.relatedToCurrent;
|
||||
aOriginPrincipal = params.originPrincipal;
|
||||
aOpener = params.opener;
|
||||
}
|
||||
|
||||
var bgLoad = (aLoadInBackground != null) ? aLoadInBackground :
|
||||
|
|
@ -1368,7 +1370,8 @@
|
|||
allowThirdPartyFixup: aAllowThirdPartyFixup,
|
||||
fromExternal: aFromExternal,
|
||||
originPrincipal: aOriginPrincipal,
|
||||
relatedToCurrent: aRelatedToCurrent});
|
||||
relatedToCurrent: aRelatedToCurrent,
|
||||
opener: aOpener });
|
||||
if (!bgLoad)
|
||||
this.selectedTab = tab;
|
||||
|
||||
|
|
@ -1495,6 +1498,7 @@
|
|||
var aSkipAnimation;
|
||||
var aOriginPrincipal;
|
||||
var aSkipBackgroundNotify;
|
||||
var aOpener;
|
||||
if (arguments.length == 2 &&
|
||||
typeof arguments[1] == "object" &&
|
||||
!(arguments[1] instanceof Ci.nsIURI)) {
|
||||
|
|
@ -1510,6 +1514,7 @@
|
|||
aRelatedToCurrent = params.relatedToCurrent;
|
||||
aSkipAnimation = params.skipAnimation;
|
||||
aOriginPrincipal = params.originPrincipal;
|
||||
aOpener = params.opener;
|
||||
aSkipBackgroundNotify = params.skipBackgroundNotify;
|
||||
}
|
||||
|
||||
|
|
@ -1584,6 +1589,10 @@
|
|||
b.setAttribute("showresizer", "true");
|
||||
}
|
||||
|
||||
if (aOpener) {
|
||||
b.QueryInterface(Ci.nsIFrameLoaderOwner).presetOpenerWindow(aOpener);
|
||||
}
|
||||
|
||||
if (this.hasAttribute("autocompletepopup"))
|
||||
b.setAttribute("autocompletepopup", this.getAttribute("autocompletepopup"));
|
||||
b.setAttribute("autoscrollpopup", this._autoScrollPopup.id);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue