mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-23 15:47:30 +09:00
Bug 1216684 - Notification permissions cannot be global granted/denied in private windows
This commit is contained in:
parent
06fc4f755f
commit
99d6131d72
1 changed files with 35 additions and 20 deletions
|
|
@ -1809,27 +1809,42 @@ ContentPermissionPrompt.prototype = {
|
||||||
var message = browserBundle.formatStringFromName("webNotifications.showFromSite",
|
var message = browserBundle.formatStringFromName("webNotifications.showFromSite",
|
||||||
[requestingURI.host], 1);
|
[requestingURI.host], 1);
|
||||||
|
|
||||||
var actions = [
|
var actions;
|
||||||
{
|
|
||||||
stringId: "webNotifications.showForSession",
|
|
||||||
action: Ci.nsIPermissionManager.ALLOW_ACTION,
|
|
||||||
expireType: Ci.nsIPermissionManager.EXPIRE_SESSION,
|
|
||||||
callback: function() {},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
stringId: "webNotifications.alwaysShow",
|
|
||||||
action: Ci.nsIPermissionManager.ALLOW_ACTION,
|
|
||||||
expireType: null,
|
|
||||||
callback: function() {},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
stringId: "webNotifications.neverShow",
|
|
||||||
action: Ci.nsIPermissionManager.DENY_ACTION,
|
|
||||||
expireType: null,
|
|
||||||
callback: function() {},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
|
var browser = this._getBrowserForRequest(aRequest);
|
||||||
|
// Only show "allow for session" in PB mode, we don't
|
||||||
|
// support "allow for session" in non-PB mode.
|
||||||
|
if (PrivateBrowsingUtils.isBrowserPrivate(browser)) {
|
||||||
|
actions = [
|
||||||
|
{
|
||||||
|
stringId: "webNotifications.showForSession",
|
||||||
|
action: Ci.nsIPermissionManager.ALLOW_ACTION,
|
||||||
|
expireType: Ci.nsIPermissionManager.EXPIRE_SESSION,
|
||||||
|
callback: function() {},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
} else {
|
||||||
|
actions = [
|
||||||
|
{
|
||||||
|
stringId: "webNotifications.showForSession",
|
||||||
|
action: Ci.nsIPermissionManager.ALLOW_ACTION,
|
||||||
|
expireType: Ci.nsIPermissionManager.EXPIRE_SESSION,
|
||||||
|
callback: function() {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
stringId: "webNotifications.alwaysShow",
|
||||||
|
action: Ci.nsIPermissionManager.ALLOW_ACTION,
|
||||||
|
expireType: null,
|
||||||
|
callback: function() {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
stringId: "webNotifications.neverShow",
|
||||||
|
action: Ci.nsIPermissionManager.DENY_ACTION,
|
||||||
|
expireType: null,
|
||||||
|
callback: function() {},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
var options = {
|
var options = {
|
||||||
learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
|
learnMoreURL: Services.urlFormatter.formatURLPref("browser.push.warning.infoURL"),
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue