mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 14:25:52 +00:00
Bug 971743 - Do not clear the download history with the browsing history. r=wesj
This commit is contained in:
parent
92397e9fda
commit
57ddd1fa0b
@ -156,14 +156,14 @@ size. -->
|
||||
<!ENTITY pref_sync "Sync">
|
||||
<!ENTITY pref_search_suggestions "Show search suggestions">
|
||||
<!ENTITY pref_import_android "Import from Android">
|
||||
<!ENTITY pref_private_data_history "Browsing & download history">
|
||||
<!ENTITY pref_private_data_history2 "Browsing history">
|
||||
<!ENTITY pref_private_data_formdata "Form & search history">
|
||||
<!ENTITY pref_private_data_cookies2 "Cookies & active logins">
|
||||
<!ENTITY pref_private_data_passwords "Saved passwords">
|
||||
<!ENTITY pref_private_data_cache "Cache">
|
||||
<!ENTITY pref_private_data_offlineApps "Offline website data">
|
||||
<!ENTITY pref_private_data_siteSettings2 "Site settings">
|
||||
<!ENTITY pref_private_data_downloadFiles "Downloaded files">
|
||||
<!ENTITY pref_private_data_downloadFiles2 "Downloads">
|
||||
|
||||
|
||||
<!ENTITY pref_about_firefox "About &brandShortName;">
|
||||
|
@ -78,8 +78,8 @@
|
||||
<item>android_import.data.history</item>
|
||||
</string-array>
|
||||
<string-array name="pref_private_data_entries">
|
||||
<item>@string/pref_private_data_history</item>
|
||||
<item>@string/pref_private_data_downloadFiles</item>
|
||||
<item>@string/pref_private_data_history2</item>
|
||||
<item>@string/pref_private_data_downloadFiles2</item>
|
||||
<item>@string/pref_private_data_formdata</item>
|
||||
<item>@string/pref_private_data_cookies2</item>
|
||||
<item>@string/pref_private_data_passwords</item>
|
||||
@ -98,7 +98,7 @@
|
||||
<item>true</item>
|
||||
</string-array>
|
||||
<string-array name="pref_private_data_keys">
|
||||
<item>private.data.history_downloads</item>
|
||||
<item>private.data.history</item>
|
||||
<item>private.data.downloadFiles</item>
|
||||
<item>private.data.formdata</item>
|
||||
<item>private.data.cookies_sessions</item>
|
||||
|
@ -167,14 +167,14 @@
|
||||
<string name="pref_show_product_announcements">&pref_show_product_announcements;</string>
|
||||
<string name="pref_sync">&pref_sync;</string>
|
||||
<string name="pref_search_suggestions">&pref_search_suggestions;</string>
|
||||
<string name="pref_private_data_history">&pref_private_data_history;</string>
|
||||
<string name="pref_private_data_history2">&pref_private_data_history2;</string>
|
||||
<string name="pref_private_data_formdata">&pref_private_data_formdata;</string>
|
||||
<string name="pref_private_data_cookies2">&pref_private_data_cookies2;</string>
|
||||
<string name="pref_private_data_passwords">&pref_private_data_passwords;</string>
|
||||
<string name="pref_private_data_cache">&pref_private_data_cache;</string>
|
||||
<string name="pref_private_data_offlineApps">&pref_private_data_offlineApps;</string>
|
||||
<string name="pref_private_data_siteSettings">&pref_private_data_siteSettings2;</string>
|
||||
<string name="pref_private_data_downloadFiles">&pref_private_data_downloadFiles;</string>
|
||||
<string name="pref_private_data_downloadFiles2">&pref_private_data_downloadFiles2;</string>
|
||||
<string name="pref_import_android">&pref_import_android;</string>
|
||||
<string name="pref_update_autodownload">&pref_update_autodownload2;</string>
|
||||
<string name="pref_update_autodownload_wifi">&pref_update_autodownload_wifi;</string>
|
||||
|
@ -1306,16 +1306,6 @@ var BrowserApp = {
|
||||
|
||||
try {
|
||||
switch (key) {
|
||||
case "history_downloads":
|
||||
Sanitizer.clearItem("history");
|
||||
|
||||
// If we're also removing downloaded files, don't clear the
|
||||
// download history yet since it will be handled when the files are
|
||||
// removed.
|
||||
if (!json["downloadFiles"]) {
|
||||
Sanitizer.clearItem("downloads");
|
||||
}
|
||||
break;
|
||||
case "cookies_sessions":
|
||||
Sanitizer.clearItem("cookies");
|
||||
Sanitizer.clearItem("sessions");
|
||||
|
@ -177,20 +177,6 @@ Sanitizer.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
downloads: {
|
||||
clear: function ()
|
||||
{
|
||||
downloads.iterate(function (dl) {
|
||||
dl.remove();
|
||||
});
|
||||
},
|
||||
|
||||
get canClear()
|
||||
{
|
||||
return downloads.canClear;
|
||||
}
|
||||
},
|
||||
|
||||
downloadFiles: {
|
||||
clear: function ()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user