Import r6976 from upstream hg supporting Firefox up to 25.*

[dactyl.git] / common / modules / downloads.jsm

diff --git a/common/modules/downloads.jsm b/common/modules/downloads.jsm
index 26ac1ccd31dc0df00f00d86bfdb954e27f2d0cd5..cbcd9a6e4fcaf4ff3ffccc4ae1bb3e35213c4850 100644 (file)
--- a/common/modules/downloads.jsm
+++ b/common/modules/downloads.jsm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2012 Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2011-2013 Kris Maglione <maglione.k@gmail.com>
 //
 // This work is licensed for reuse under an MIT license. Details are
 // given in the LICENSE.txt file included with this file.
@@ -131,14 +131,14 @@ var Download = Class("Download", {
     },
 
     _compare: {
-        active: function (a, b) a.alive - b.alive,
-        complete: function (a, b) a.percentComplete - b.percentComplete,
-        date: function (a, b) a.startTime - b.startTime,
-        filename: function (a, b) String.localeCompare(a.targetFile.leafName, b.targetFile.leafName),
-        size: function (a, b) a.size - b.size,
-        speed: function (a, b) a.speed - b.speed,
-        time: function (a, b) a.timeRemaining - b.timeRemaining,
-        url: function (a, b) String.localeCompare(a.source.spec, b.source.spec)
+        active: (a, b) => a.alive - b.alive,
+        complete: (a, b) => a.percentComplete - b.percentComplete,
+        date: (a, b) => a.startTime - b.startTime,
+        filename: (a, b) => String.localeCompare(a.targetFile.leafName, b.targetFile.leafName),
+        size: (a, b) => a.size - b.size,
+        speed: (a, b) => a.speed - b.speed,
+        time: (a, b) => a.timeRemaining - b.timeRemaining,
+        url: (a, b) => String.localeCompare(a.source.spec, b.source.spec)
     },
 
     compare: function compare(other) values(this.list.sortOrder).map(function (order) {
@@ -281,7 +281,7 @@ var DownloadList = Class("DownloadList",
                 return;
 
             this.downloads[id] = download;
-            let index = values(this.downloads).sort(function (a, b) a.compare(b))
+            let index = values(this.downloads).sort((a, b) => a.compare(b))
                                               .indexOf(download);
 
             this.nodes.list.insertBefore(download.nodes.row,
@@ -301,7 +301,7 @@ var DownloadList = Class("DownloadList",
     },
 
     allowedCommands: Class.Memoize(function () let (self = this) ({
-        get clear() values(self.downloads).some(function (dl) dl.allowedCommands.remove)
+        get clear() values(self.downloads).some(dl => dl.allowedCommands.remove)
     })),
 
     commands: {
@@ -311,7 +311,7 @@ var DownloadList = Class("DownloadList",
     },
 
     sort: function sort() {
-        let list = values(this.downloads).sort(function (a, b) a.compare(b));
+        let list = values(this.downloads).sort((a, b) => a.compare(b));
 
         for (let [i, download] in iter(list))
             if (this.nodes.list.childNodes[i + 1] != download.nodes.row)
@@ -319,7 +319,7 @@ var DownloadList = Class("DownloadList",
                                              this.nodes.list.childNodes[i + 1]);
     },
 
-    shouldSort: function shouldSort() Array.some(arguments, function (val) this.sortOrder.some(function (v) v.substr(1) == val), this),
+    shouldSort: function shouldSort() Array.some(arguments, val => this.sortOrder.some(v => v.substr(1) == val)),
 
     update: function update() {
         for (let node in values(this.nodes))
@@ -336,11 +336,11 @@ var DownloadList = Class("DownloadList",
 
     updateProgress: function updateProgress() {
         let downloads = values(this.downloads).toArray();
-        let active    = downloads.filter(function (d) d.alive);
+        let active    = downloads.filter(d => d.alive);
 
         let self = Object.create(this);
         for (let prop in values(["amountTransferred", "size", "speed", "timeRemaining"]))
-            this[prop] = active.reduce(function (acc, dl) dl[prop] + acc, 0);
+            this[prop] = active.reduce((acc, dl) => dl[prop] + acc, 0);
 
         Download.prototype.updateProgress.call(self);
 
@@ -489,21 +489,21 @@ var Downloads = Module("downloads", XPCOM(Ci.nsIDownloadProgressListener), {
                 },
 
                 completer: function (context, extra) {
-                    let seen = Set.has(Set(extra.values.map(function (val) val.substr(1))));
+                    let seen = Set.has(Set(extra.values.map(val => val.substr(1))));
 
-                    context.completions = iter(this.values).filter(function ([k, v]) !seen(k))
-                                                           .map(function ([k, v]) [["+" + k, [v, " (", _("sort.ascending"), ")"].join("")],
-                                                                                   ["-" + k, [v, " (", _("sort.descending"), ")"].join("")]])
+                    context.completions = iter(this.values).filter(([k, v]) => !seen(k))
+                                                           .map(([k, v]) => [["+" + k, [v, " (", _("sort.ascending"), ")"].join("")],
+                                                                             ["-" + k, [v, " (", _("sort.descending"), ")"].join("")]])
                                                            .flatten().array;
                 },
 
-                has: function () Array.some(arguments, function (val) this.value.some(function (v) v.substr(1) == val)),
+                has: function () Array.some(arguments, val => this.value.some(v => v.substr(1) == val)),
 
                 validator: function (value) {
                     let seen = {};
-                    return value.every(function (val) /^[+-]/.test(val) && Set.has(this.values, val.substr(1))
-                                                                        && !Set.add(seen, val.substr(1)),
-                                       this) && value.length;
+                    return value.every(val => /^[+-]/.test(val) && Set.has(this.values, val.substr(1))
+                                                                && !Set.add(seen, val.substr(1)))
+                        && value.length;
                 }
             });
     }