From 0c789ae13fd9abca2914d5401b39f0019632d5ec Mon Sep 17 00:00:00 2001
From: Dan Banner <dbugs@thebanners.uk>
Date: Tue, 29 Aug 2017 18:57:11 +0100
Subject: [PATCH] Bug 1394820 - Enable ESLint for DownloadIntegration.jsm
 r=standard8

MozReview-Commit-ID: INwMSXSJ31f

--HG--
extra : rebase_source : c7b2b8f0908b28ea606cee2535d279d44bfe9126
---
 .eslintignore                                 |  1 -
 .../jsdownloads/src/DownloadIntegration.jsm   | 50 ++++++++-----------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 99d2db5d5dba..043565162424 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -348,7 +348,6 @@ toolkit/components/reader/JSDOMParser.js
 
 # Uses preprocessing
 toolkit/content/widgets/wizard.xml
-toolkit/components/jsdownloads/src/DownloadIntegration.jsm
 toolkit/components/osfile/osfile.jsm
 toolkit/components/urlformatter/nsURLFormatter.js
 toolkit/modules/AppConstants.jsm
diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
index 5bbcfe511836..306fe58e60fe 100644
--- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
@@ -80,6 +80,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "volumeService",
 
 // We have to use the gCombinedDownloadIntegration identifier because, in this
 // module only, the DownloadIntegration identifier refers to the base version.
+/* global gCombinedDownloadIntegration:false */
 Integration.downloads.defineModuleGetter(this, "gCombinedDownloadIntegration",
             "resource://gre/modules/DownloadIntegration.jsm",
             "DownloadIntegration");
@@ -276,7 +277,7 @@ this.DownloadIntegration = {
     } else {
       try {
         this._downloadsDirectory = this._getDirectory("DfltDwnld");
-      } catch(e) {
+      } catch (e) {
         this._downloadsDirectory = await this._createDownloadsDirectory("Home");
       }
     }
@@ -295,7 +296,7 @@ this.DownloadIntegration = {
     let directoryPath = null;
     let prefValue = Services.prefs.getIntPref("browser.download.folderList", 1);
 
-    switch(prefValue) {
+    switch (prefValue) {
       case 0: // Desktop
         directoryPath = this._getDirectory("Desk");
         break;
@@ -308,7 +309,7 @@ this.DownloadIntegration = {
                                                          Ci.nsIFile);
           directoryPath = directory.path;
           await OS.File.makeDir(directoryPath, { ignoreExisting: true });
-        } catch(ex) {
+        } catch (ex) {
           // Either the preference isn't set or the directory cannot be created.
           directoryPath = await this.getSystemDownloadsDirectory();
         }
@@ -316,7 +317,7 @@ this.DownloadIntegration = {
       case 3: // Cloud Storage
         try {
           directoryPath = await CloudStorage.getDownloadFolder();
-        } catch(ex) {}
+        } catch (ex) {}
         if (!directoryPath) {
           directoryPath = await this.getSystemDownloadsDirectory();
         }
@@ -677,7 +678,7 @@ this.DownloadIntegration = {
     // only because this is the same behavior as the system-level prompt,
     // but also because the most recently active window is the right choice
     // in basically all cases.
-    return await DownloadUIHelper.getPrompter().confirmLaunchExecutable(path);
+    return DownloadUIHelper.getPrompter().confirmLaunchExecutable(path);
   },
 
   /**
@@ -962,10 +963,8 @@ this.DownloadObserver = {
         break;
       case "wake_notification":
       case "resume_process_notification":
-        let wakeDelay = 10000;
-        try {
-          wakeDelay = Services.prefs.getIntPref("browser.download.manager.resumeOnWakeDelay");
-        } catch(e) {}
+        let wakeDelay =
+          Services.prefs.getIntPref("browser.download.manager.resumeOnWakeDelay", 10000);
 
         if (wakeDelay >= 0) {
           this._wakeTimer = new Timer(this._resumeOfflineDownloads.bind(this), wakeDelay,
@@ -1004,8 +1003,7 @@ this.DownloadObserver = {
  * @param aList
  *        DownloadList object linked to this observer.
  */
-this.DownloadHistoryObserver = function (aList)
-{
+this.DownloadHistoryObserver = function(aList) {
   this._list = aList;
   PlacesUtils.history.addObserver(this);
 }
@@ -1029,12 +1027,12 @@ this.DownloadHistoryObserver.prototype = {
     this._list.removeFinished();
   },
 
-  onTitleChanged: function () {},
-  onBeginUpdateBatch: function () {},
-  onEndUpdateBatch: function () {},
-  onVisit: function () {},
-  onPageChanged: function () {},
-  onDeleteVisits: function () {},
+  onTitleChanged() {},
+  onBeginUpdateBatch() {},
+  onEndUpdateBatch() {},
+  onVisit() {},
+  onPageChanged() {},
+  onDeleteVisits() {},
 };
 
 /**
@@ -1051,8 +1049,7 @@ this.DownloadHistoryObserver.prototype = {
  * @param aStore
  *        The DownloadStore object used for saving.
  */
-this.DownloadAutoSaveView = function (aList, aStore)
-{
+this.DownloadAutoSaveView = function(aList, aStore) {
   this._list = aList;
   this._store = aStore;
   this._downloadsMap = new Map();
@@ -1084,8 +1081,7 @@ this.DownloadAutoSaveView.prototype = {
    * @resolves When the view has been registered.
    * @rejects JavaScript exception.
    */
-  initialize: function ()
-  {
+  initialize() {
     // We set _initialized to true after adding the view, so that
     // onDownloadAdded doesn't cause a save to occur.
     return this._list.addView(this).then(() => this._initialized = true);
@@ -1107,14 +1103,12 @@ this.DownloadAutoSaveView.prototype = {
    * Called when the list of downloads changed, this triggers the asynchronous
    * serialization of the list of downloads.
    */
-  saveSoon: function ()
-  {
+  saveSoon() {
     this._writer.arm();
   },
 
   // DownloadList callback
-  onDownloadAdded: function (aDownload)
-  {
+  onDownloadAdded(aDownload) {
     if (gCombinedDownloadIntegration.shouldPersistDownload(aDownload)) {
       this._downloadsMap.set(aDownload, aDownload.getSerializationHash());
       if (this._initialized) {
@@ -1124,8 +1118,7 @@ this.DownloadAutoSaveView.prototype = {
   },
 
   // DownloadList callback
-  onDownloadChanged: function (aDownload)
-  {
+  onDownloadChanged(aDownload) {
     if (!gCombinedDownloadIntegration.shouldPersistDownload(aDownload)) {
       if (this._downloadsMap.has(aDownload)) {
         this._downloadsMap.delete(aDownload);
@@ -1142,8 +1135,7 @@ this.DownloadAutoSaveView.prototype = {
   },
 
   // DownloadList callback
-  onDownloadRemoved: function (aDownload)
-  {
+  onDownloadRemoved(aDownload) {
     if (this._downloadsMap.has(aDownload)) {
       this._downloadsMap.delete(aDownload);
       this.saveSoon();