diff --git a/common/content/autocommands.js b/common/content/autocommands.js index 582337ce..e13a3695 100644 --- a/common/content/autocommands.js +++ b/common/content/autocommands.js @@ -71,6 +71,8 @@ var AutoCmdHive = Class("AutoCmdHive", Contexts.Hive, { */ var AutoCommands = Module("autocommands", { init: function () { + if (config.haveGecko("26")) + delete config.autocommands.DownloadPost; // FIXME }, get activeHives() contexts.allGroups.autocmd.filter(h => h._store.length), diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml index 9c127daa..67e4f2f6 100644 --- a/common/locale/en-US/gui.xml +++ b/common/locale/en-US/gui.xml @@ -74,6 +74,9 @@
-sort
Sort order (see downloadsort) (short name: -s)
+ + This command is currently unavailable in &dactyl.host; 26 and greater. + diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index eed009c1..1c524bbd 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -576,8 +576,12 @@ 'dls' 'dlsort' 'downloadsort' 'downloadsort' 'dlsort' 'dls' + + stringlist + -active,+filename

:downloads sort order, in order of precedence. @@ -596,6 +600,9 @@

time
Time remaining
url
Source URL
+ + This option is currently unavailable in &dactyl.host; 26 and greater. +
diff --git a/common/modules/config.jsm b/common/modules/config.jsm index d009e1a4..881337b6 100644 --- a/common/modules/config.jsm +++ b/common/modules/config.jsm @@ -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)); diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm index 2db1dfe5..626f9e7e 100644 --- a/common/modules/sanitizer.jsm +++ b/common/modules/sanitizer.jsm @@ -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() }; } diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf index 18c945b8..011006cf 100644 --- a/pentadactyl/install.rdf +++ b/pentadactyl/install.rdf @@ -32,7 +32,7 @@ + em:maxVersion="26.*"/> diff --git a/pentadactyl/locale/en-US/autocommands.xml b/pentadactyl/locale/en-US/autocommands.xml index d2aa0ce4..eaad10da 100644 --- a/pentadactyl/locale/en-US/autocommands.xml +++ b/pentadactyl/locale/en-US/autocommands.xml @@ -13,7 +13,8 @@
BookmarkRemove
Triggered after a page's bookmark is removed
ColorScheme
Triggered after a color scheme has been loaded
DOMLoad
Triggered when a page's DOM content has fully loaded
-
DownloadPost
Triggered when a download has completed
+
DownloadPost
Triggered when a download has completed + currently unavailable in &dactyl.host; 26 and greater
Fullscreen
Triggered when the browser's fullscreen state changes
LocationChange
Triggered when changing tabs or when navigating to a new location
PageLoadPre
Triggered after a page load is initiated