mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 722996 - cookieAcceptDialog.js uses global Private Browsing state to make decisions; r=ehsan
This commit is contained in:
parent
5c5f0c538c
commit
e748110311
@ -9,6 +9,8 @@ const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
|
|||||||
const nsICookie = Components.interfaces.nsICookie;
|
const nsICookie = Components.interfaces.nsICookie;
|
||||||
const nsICookiePromptService = Components.interfaces.nsICookiePromptService;
|
const nsICookiePromptService = Components.interfaces.nsICookiePromptService;
|
||||||
|
|
||||||
|
Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
|
||||||
|
|
||||||
var params;
|
var params;
|
||||||
var cookieBundle;
|
var cookieBundle;
|
||||||
var gDateService = null;
|
var gDateService = null;
|
||||||
@ -24,7 +26,7 @@ function onload()
|
|||||||
var dialog = document.documentElement;
|
var dialog = document.documentElement;
|
||||||
|
|
||||||
document.getElementById("Button2").collapsed = false;
|
document.getElementById("Button2").collapsed = false;
|
||||||
|
|
||||||
document.getElementById("ok").label = dialog.getAttribute("acceptLabel");
|
document.getElementById("ok").label = dialog.getAttribute("acceptLabel");
|
||||||
document.getElementById("ok").accessKey = dialog.getAttribute("acceptKey");
|
document.getElementById("ok").accessKey = dialog.getAttribute("acceptKey");
|
||||||
document.getElementById("Button2").label = dialog.getAttribute("extra1Label");
|
document.getElementById("Button2").label = dialog.getAttribute("extra1Label");
|
||||||
@ -67,7 +69,6 @@ function onload()
|
|||||||
params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
|
params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
|
||||||
var objects = params.objects;
|
var objects = params.objects;
|
||||||
var cookie = params.objects.queryElementAt(0,nsICookie);
|
var cookie = params.objects.queryElementAt(0,nsICookie);
|
||||||
|
|
||||||
var cookiesFromHost = params.GetInt(nsICookieAcceptDialog.COOKIESFROMHOST);
|
var cookiesFromHost = params.GetInt(nsICookieAcceptDialog.COOKIESFROMHOST);
|
||||||
|
|
||||||
var messageFormat;
|
var messageFormat;
|
||||||
@ -130,9 +131,7 @@ function onload()
|
|||||||
|
|
||||||
// The Private Browsing service might not be available
|
// The Private Browsing service might not be available
|
||||||
try {
|
try {
|
||||||
var pb = Components.classes["@mozilla.org/privatebrowsing;1"].
|
if (window.opener && PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
|
||||||
getService(Components.interfaces.nsIPrivateBrowsingService);
|
|
||||||
if (pb.privateBrowsingEnabled) {
|
|
||||||
var persistCheckbox = document.getElementById("persistDomainAcceptance");
|
var persistCheckbox = document.getElementById("persistDomainAcceptance");
|
||||||
persistCheckbox.removeAttribute("checked");
|
persistCheckbox.removeAttribute("checked");
|
||||||
persistCheckbox.setAttribute("disabled", "true");
|
persistCheckbox.setAttribute("disabled", "true");
|
||||||
|
Loading…
Reference in New Issue
Block a user