Merge pull request #24 from zklinger/issue_7

maxauthority · maxauthority · commit 2a315ec9ae8c · 2014-08-12T20:08:44.000+02:00
Fix #7
diff --git a/common/content/sanitizer.js b/common/content/sanitizer.js
@@ -95,18 +95,19 @@ const Sanitizer = Module("sanitizer", {
                 }
                 else {
                     liberator.assert(args.length > 0, "Argument required");
-                    let items = [item for (item of args.map(Sanitizer.argToPref))];
-                    for (let item of items) {
-                        if (!options.get("sanitizeitems").isValidValue(item)) {
-                            liberator.echoerr("Invalid data item: " + item);
+
+                    for (let [,elem] in args) {
+                        if (!options.get("sanitizeitems").isValidValue(elem)) {
+                            liberator.echoerr("Invalid data item: " + elem);
                             return;
                         }
                     }
 
                     liberator.echomsg("Sanitizing " + args + " items...");
 
+                    let items = [item for (item of args.map(Sanitizer.argToPref))];
                     for (let item of items) {
-                        if (sanitizer.canClearItem(item)) {
+                        if (sanitizer.canClearItem(item, function () {})) {
                             try {
                                 sanitizer.clearItem(item);
                             }

Original file line number	Diff line number	Diff line change
`@@ -95,18 +95,19 @@ const Sanitizer = Module("sanitizer", {`
`95`	`95`	`}`
`96`	`96`	`else {`
`97`	`97`	`liberator.assert(args.length > 0, "Argument required");`
`98`		`- let items = [item for (item of args.map(Sanitizer.argToPref))];`
`99`		`- for (let item of items) {`
`100`		`- if (!options.get("sanitizeitems").isValidValue(item)) {`
`101`		`- liberator.echoerr("Invalid data item: " + item);`
	`98`	`+`
	`99`	`+ for (let [,elem] in args) {`
	`100`	`+ if (!options.get("sanitizeitems").isValidValue(elem)) {`
	`101`	`+ liberator.echoerr("Invalid data item: " + elem);`
`102`	`102`	`return;`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`liberator.echomsg("Sanitizing " + args + " items...");`
`107`	`107`
	`108`	`+ let items = [item for (item of args.map(Sanitizer.argToPref))];`
`108`	`109`	`for (let item of items) {`
`109`		`- if (sanitizer.canClearItem(item)) {`
	`110`	`+ if (sanitizer.canClearItem(item, function () {})) {`
`110`	`111`	`try {`
`111`	`112`	`sanitizer.clearItem(item);`
`112`	`113`	`}`