mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-02-09 21:35:46 +01:00
Merge.
This commit is contained in:
@@ -45,6 +45,9 @@ var ConfigBase = Class("ConfigBase", {
|
||||
* initialization code. Must call superclass's init function.
|
||||
*/
|
||||
init: function init() {
|
||||
if (config.haveGecko("26"))
|
||||
this.modules.global = this.modules.global.filter(m => m != "downloads"); // FIXME
|
||||
|
||||
this.loadConfig();
|
||||
|
||||
this.features.push = deprecated("Set.add", function push(feature) Set.add(this, feature));
|
||||
|
||||
@@ -446,6 +446,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
|
||||
if (args.bang)
|
||||
dactyl.assert(args.length == 0, _("error.trailingCharacters"));
|
||||
else {
|
||||
dactyl.assert(args.length, _("error.argumentRequired"));
|
||||
dactyl.assert(opt.validator(args), _("error.invalidArgument"));
|
||||
opt = { __proto__: opt, value: args.slice() };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user