Merge.

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),

common/locale/en-US/gui.xml

@@ -74,6 +74,9 @@
         <dl>
             <dt>-sort</dt> <dd>Sort order (see <o>downloadsort</o>) (short name: <em>-s</em>)</dd>
         </dl>
+        <note>
+            This command is currently unavailable in &dactyl.host; 26 and greater.
+        </note>
     </description>
 </item>
 

common/locale/en-US/options.xml

@@ -576,8 +576,12 @@
     <tags>'dls' 'dlsort' 'downloadsort'</tags>
     <spec>'downloadsort' 'dlsort' 'dls'</spec>
     <strut/>
+    <!--
     <type>&option.downloadsort.type;</type>
     <default>&option.downloadsort.default;</default>
+    -->
+    <type>stringlist</type>
+    <default>-active,+filename</default>
     <description>
         <p>
             <ex>:downloads</ex> sort order, in order of precedence.
@@ -596,6 +600,9 @@
             <dt>time</dt>     <dd>Time remaining</dd>
             <dt>url</dt>      <dd>Source URL</dd>
         </dl>
+        <note>
+            This option is currently unavailable in &dactyl.host; 26 and greater.
+        </note>
     </description>
 </item>
 

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));

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() };
                 }

pentadactyl/install.rdf

@@ -32,7 +32,7 @@
             <Description
                 em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                 em:minVersion="22.0"
-                em:maxVersion="25.*"/>
+                em:maxVersion="26.*"/>
         </em:targetApplication>
     </Description>
 </RDF>

pentadactyl/locale/en-US/autocommands.xml

@@ -13,7 +13,8 @@
     <dt>BookmarkRemove</dt>    <dd>Triggered after a page's bookmark is removed</dd>
     <dt>ColorScheme</dt>       <dd>Triggered after a color scheme has been loaded</dd>
     <dt>DOMLoad</dt>           <dd>Triggered when a page's DOM content has fully loaded</dd>
-    <dt>DownloadPost</dt>      <dd>Triggered when a download has completed</dd>
+    <dt>DownloadPost</dt>      <dd>Triggered when a download has completed
+                               <note>currently unavailable in &dactyl.host; 26 and greater</note></dd>
     <dt>Fullscreen</dt>        <dd>Triggered when the browser's fullscreen state changes</dd>
     <dt>LocationChange</dt>    <dd>Triggered when changing tabs or when navigating to a new location</dd>
     <dt>PageLoadPre</dt>       <dd>Triggered after a page load is initiated</dd>