Bug 1417450 - Fix eslint after upgrade to v4. r=MakeMyDay

MozReview-Commit-ID: Ao9ccbj1jQ8 --HG-- extra : rebase_source : 20da198c5e85eaef0c1fd8811e83337acdb26592
2017-11-15 15:24:49 +01:00 · 2017-11-15 15:24:49 +01:00 · 6105d979dd
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -21,4 +21,13 @@ module.exports = {
  "settings": {
    "html/xml-extensions": [ ".xhtml" ]
  },
+
+  "overrides": [{
+    // eslint-plugin-html handles eol-last slightly different - it applies to
+    // each set of script tags, so we turn it off here.
+    "files": "**/*.*html",
+    "rules": {
+      "eol-last": "off",
+    }
+  }]
 };
--- a/calendar/.eslintrc.js
+++ b/calendar/.eslintrc.js
@ -155,7 +155,7 @@ module.exports = {
        // Disallow use of multiple spaces (sometimes used to align const values,
        // array or object items, etc.). It's hard to maintain and doesn't add that
        // much benefit.
-        "no-multi-spaces": 2,
+        "no-multi-spaces": [2, { ignoreEOLComments: true }],

        // Require spaces around operators, except for a|0.
        // Disabled for now given eslint doesn't support default args yet
@ -475,7 +475,7 @@ module.exports = {
        "no-case-declarations": 2,

        // Enforce consistent indentation (4-space)
-        "indent": [2, 4, { SwitchCase: 1 }],
+        "indent-legacy": [2, 4, { SwitchCase: 1, }],

        // The following rules will not be enabled currently, but are kept here for
        // easier updates in the future.
--- a/calendar/base/content/calendar-common-sets.js
+++ b/calendar/base/content/calendar-common-sets.js
@ -437,7 +437,6 @@ var calendarController = {
                    // care. If we don't have a default controller, just continue.
                    this.defaultController.doCommand(aCommand);
                }
-
        }
    },

--- a/calendar/base/content/calendar-multiday-view.xml
+++ b/calendar/base/content/calendar-multiday-view.xml
@ -2659,7 +2659,6 @@
        <body><![CDATA[
            aSubject.QueryInterface(Components.interfaces.nsIPrefBranch);
            switch (aPreference) {
-
                case "calendar.view.daystarthour":
                    this.setDayStartEndMinutes(aSubject.getIntPref(aPreference) * 60,
                                               this.mDayEndMin);
--- a/calendar/base/src/calFilter.js
+++ b/calendar/base/src/calFilter.js
@ -208,7 +208,6 @@ calFilter.prototype = {
        }

        switch (aFilter) {
-
            // Predefined Task filters
            case "notstarted":
                props.status = props.FILTER_STATUS_INCOMPLETE;
--- a/calendar/itip/calItipEmailTransport.js
+++ b/calendar/itip/calItipEmailTransport.js
@ -320,14 +320,14 @@ calItipEmailTransport.prototype = {
                                            account.key,
                                            composeFields,
                                            mailFile,
-                                            true  /* deleteSendFileOnCompletion */,
-                                            false /* digest_p */,
+                                            true,  // deleteSendFileOnCompletion
+                                            false, // digest_p
                                            (Services.io.offline ? Components.interfaces.nsIMsgSend.nsMsgQueueForLater
                                                    : Components.interfaces.nsIMsgSend.nsMsgDeliverNow),
-                                            null  /* nsIMsgDBHdr msgToReplace */,
-                                            null  /* nsIMsgSendListener aListener */,
-                                            null  /* nsIMsgStatusFeedback aStatusFeedback */,
-                                            ""    /* password */);
+                                            null,  // nsIMsgDBHdr msgToReplace
+                                            null,  // nsIMsgSendListener aListener
+                                            null,  // nsIMsgStatusFeedback aStatusFeedback
+                                            "");   // password
                    return true;
                }
                break;