gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-27 01:15:47 +01:00
Code Issues Projects Releases Wiki Activity

Don't prompt on :san -h foo all

Browse Source
This commit is contained in:
Kris Maglione
2011-08-06 13:17:57 -04:00
parent f1493e5e8a
commit b9f4221643
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/modules/sanitizer.jsm
View File

@@ -407,6 +407,9 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
function (args) { function (args) {
dactyl.assert(!modules.options['private'], _("command.sanitize.privateMode")); dactyl.assert(!modules.options['private'], _("command.sanitize.privateMode"));
if (args["-host"] && !args.length)
args[0] = "all";
let timespan = args["-timespan"] || modules.options["sanitizetimespan"]; let timespan = args["-timespan"] || modules.options["sanitizetimespan"];
let range = Range(); let range = Range();
@@ -416,8 +419,6 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
: (timespan[0] == "s" ? sanitizer.sessionStart : null); : (timespan[0] == "s" ? sanitizer.sessionStart : null);
let items = args.slice(); let items = args.slice();
if (args["-host"] && !args.length)
args[0] = "all";
if (args.bang) { if (args.bang) {
dactyl.assert(args.length == 0, _("error.trailingCharacters")); dactyl.assert(args.length == 0, _("error.trailingCharacters"));
@@ -441,7 +442,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
sanitizer.sanitize(items, range); sanitizer.sanitize(items, range);
} }
if (items.indexOf("all") >= 0) if (items.indexOf("all") >= 0 && !args["-host"])
modules.commandline.input(_("sanitize.prompt.deleteAll") + " ", modules.commandline.input(_("sanitize.prompt.deleteAll") + " ",
function (resp) { function (resp) {
if (resp.match(/^y(es)?$/i)) { if (resp.match(/^y(es)?$/i)) {