Bug 739757 - Back it out fully this time on a CLOSED TREE.

This commit is contained in:
Ryan VanderMeulen 2013-03-06 13:59:09 -05:00
parent 909f22972f
commit 68af2dcceb
2 changed files with 32 additions and 20 deletions

View File

@ -5819,16 +5819,18 @@ var OfflineApps = {
}
},
{
label: strings.GetStringFromName("offlineApps.dontAllow2"),
callback: function(aChecked) {
if (aChecked)
OfflineApps.disallowSite(aContentWindow.document);
label: strings.GetStringFromName("offlineApps.never"),
callback: function() {
OfflineApps.disallowSite(aContentWindow.document);
}
},
{
label: strings.GetStringFromName("offlineApps.notNow"),
callback: function() { /* noop */ }
}];
let message = strings.formatStringFromName("offlineApps.ask", [host], 1);
let options = { checkbox: Strings.browser.GetStringFromName("offlineApps.dontAskAgain") };
NativeWindow.doorhanger.show(message, notificationID, buttons, tab.id, options);
let message = strings.formatStringFromName("offlineApps.available2", [host], 1);
NativeWindow.doorhanger.show(message, notificationID, buttons, tab.id);
},
allowSite: function(aDocument) {
@ -5899,7 +5901,7 @@ var IndexedDB = {
let message, responseTopic;
if (topic == this._permissionsPrompt) {
message = strings.formatStringFromName("offlineApps.ask", [host], 1);
message = strings.formatStringFromName("offlineApps.available2", [host], 1);
responseTopic = this._permissionsResponse;
} else if (topic == this._quotaPrompt) {
message = strings.formatStringFromName("indexedDBQuota.wantsTo", [ host, data ], 2);
@ -5947,16 +5949,21 @@ var IndexedDB = {
}
},
{
label: strings.GetStringFromName("offlineApps.dontAllow2"),
callback: function(aChecked) {
label: strings.GetStringFromName("offlineApps.never"),
callback: function() {
clearTimeout(timeoutId);
let action = aChecked ? Ci.nsIPermissionManager.DENY_ACTION : Ci.nsIPermissionManager.UNKNOWN_ACTION;
observer.observe(null, responseTopic, action);
observer.observe(null, responseTopic, Ci.nsIPermissionManager.DENY_ACTION);
}
},
{
label: strings.GetStringFromName("offlineApps.notNow"),
callback: function() {
clearTimeout(timeoutId);
observer.observe(null, responseTopic, Ci.nsIPermissionManager.UNKNOWN_ACTION);
}
}];
let options = { checkbox: Strings.browser.GetStringFromName("offlineApps.dontAskAgain") };
NativeWindow.doorhanger.show(message, notificationID, buttons, tab.id, options);
NativeWindow.doorhanger.show(message, notificationID, buttons, tab.id);
// Set the timeoutId after the popup has been created, and use the long
// timeout value. If the user doesn't notice the popup after this amount of
@ -6504,12 +6511,12 @@ var PermissionsHelper = {
"indexedDB": {
label: "offlineApps.storeOfflineData",
allowed: "offlineApps.allow",
denied: "offlineApps.dontAllow2"
denied: "offlineApps.never"
},
"offline-app": {
label: "offlineApps.storeOfflineData",
allowed: "offlineApps.allow",
denied: "offlineApps.dontAllow2"
denied: "offlineApps.never"
},
"desktop-notification": {
label: "desktopNotification.useNotifications",

View File

@ -123,16 +123,21 @@ typeError=Error:
typeWarning=Warning:
# Offline web applications
offlineApps.ask=Allow %S to store data on your device for offline use?
offlineApps.dontAskAgain=Don't ask again for this site
offlineApps.available2=%S wants to store data on your device for offline use.
offlineApps.allow=Allow
offlineApps.dontAllow2=Don't allow
offlineApps.never=Don't Allow
offlineApps.notNow=Not Now
# LOCALIZATION NOTE (offlineApps.storeOfflineData): Label that will be used in
# site settings dialog.
offlineApps.storeOfflineData=Store Offline Data
# New-style ContentPermissionPrompt values
offlineApps.dontAllow=Don't Allow
offlineApps.wantsTo=%S wants to store data on your device for offline use.
# IndexedDB Quota increases
indexedDBQuota.allow=Allow
indexedDBQuota.dontAllow=Don't Allow
indexedDBQuota.wantsTo=%S wants to store a lot of data on your device for offline use.
# Open Web Apps management API