diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 07:14:08 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 07:14:08 +0200 |
| commit | 8be0c16be614d54183ee3d4877e2243cb9e468c8 (patch) | |
| tree | 3c8df3f554aab6a42d41bfa1c3a8aa214b8ac5e3 /toolkit | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-8be0c16be614d54183ee3d4877e2243cb9e468c8.tar UXP-8be0c16be614d54183ee3d4877e2243cb9e468c8.tar.gz UXP-8be0c16be614d54183ee3d4877e2243cb9e468c8.tar.lz UXP-8be0c16be614d54183ee3d4877e2243cb9e468c8.tar.xz UXP-8be0c16be614d54183ee3d4877e2243cb9e468c8.zip | |
Clean up app strings and legacy download manager after e92808f0ebbeab3ffb79a0b1a4d190f61fb8b43a
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/mozapps/downloads/content/downloads.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js index 92a9f7593..2fdb19a74 100644 --- a/toolkit/mozapps/downloads/content/downloads.js +++ b/toolkit/mozapps/downloads/content/downloads.js @@ -7,7 +7,7 @@ // Globals const PREF_BDM_CLOSEWHENDONE = "browser.download.manager.closeWhenDone"; -const PREF_BDM_ALERTONEXEOPEN = "browser.download.manager.alertOnEXEOpen"; +const PREF_BDM_CONFIRMOPENEXE = "browser.download.confirmOpenExecutable"; const PREF_BDM_SCANWHENDONE = "browser.download.manager.scanWhenDone"; const nsLocalFile = Components.Constructor("@mozilla.org/file/local;1", @@ -78,7 +78,6 @@ var gStr = { downloadsTitleFiles: "downloadsTitleFiles", downloadsTitlePercent: "downloadsTitlePercent", fileExecutableSecurityWarningTitle: "fileExecutableSecurityWarningTitle", - fileExecutableSecurityWarningDontAsk: "fileExecutableSecurityWarningDontAsk" }; // The statement to query for downloads that are active or match the search @@ -251,7 +250,7 @@ function openDownload(aDownload) var pref = Cc["@mozilla.org/preferences-service;1"]. getService(Ci.nsIPrefBranch); try { - dontAsk = !pref.getBoolPref(PREF_BDM_ALERTONEXEOPEN); + dontAsk = !pref.getBoolPref(PREF_BDM_CONFIRMOPENEXE); } catch (e) { } if (AppConstants.platform == "win") { @@ -273,16 +272,13 @@ function openDownload(aDownload) var message = strings.getFormattedString("fileExecutableSecurityWarning", [name, name]); let title = gStr.fileExecutableSecurityWarningTitle; - let dontAsk = gStr.fileExecutableSecurityWarningDontAsk; var promptSvc = Cc["@mozilla.org/embedcomp/prompt-service;1"]. getService(Ci.nsIPromptService); - var checkbox = { value: false }; - var open = promptSvc.confirmCheck(window, title, message, dontAsk, checkbox); + var open = promptSvc.confirm(window, title, message); if (!open) return; - pref.setBoolPref(PREF_BDM_ALERTONEXEOPEN, !checkbox.value); } } try { |