Enable some more eslint checks

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index f1785846d5eab00253500113374a217ea9469f04..c8377226a0b725b9564905c0396817818e7426fb 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -44,7 +44,7 @@ L.OSM.Map = L.Map.extend({
     }
 
     this.baseLayers.push(new L.OSM.HOT({
     }
 
     this.baseLayers.push(new L.OSM.HOT({

-      attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>" + " hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>",
+      attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>",

       code: "H",
       keyid: "hot",
       name: I18n.t("javascripts.map.base.hot")
       code: "H",
       keyid: "hot",
       name: I18n.t("javascripts.map.base.hot")


@@ -136,9 +136,10 @@ L.OSM.Map = L.Map.extend({
       // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
       // and drops the last 4 bits of the full 64 bit Morton code.
       c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
       // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
       // and drops the last 4 bits of the full 64 bit Morton code.
       c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),

-      digit;
+      digit,
+      i;

 
 

-    for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
+    for (i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {

       digit = (c1 >> (24 - 6 * i)) & 0x3f;
       str += char_array.charAt(digit);
     }
       digit = (c1 >> (24 - 6 * i)) & 0x3f;
       str += char_array.charAt(digit);
     }

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 92f6cd881f8264e7e9a980963257e060adbb8e11..bca8e5c6a6d7ba5d5db43b1e383bcf3f4de54860 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -313,7 +313,7 @@ L.OSM.share = function (options) {
         "\"": """,
         "'": "'"
       };
         "\"": """,
         "'": "'"
       };

-      return string === null ? "" : (string + "").replace(/[&<>"']/g, function(match) {
+      return string === null ? "" : String(string).replace(/[&<>"']/g, function(match) {

         return htmlEscapes[match];
       });
     }
         return htmlEscapes[match];
       });
     }

diff --git a/config/eslint.json b/config/eslint.json
index 5b058e354103ca4e3489c886317034347962cb35..c207e35951b3c79fc9226cfef5d8a6e9f91a438f 100644 (file)
--- a/config/eslint.json
+++ b/config/eslint.json
@@ -17,14 +17,22 @@
     "updateLinks": "readonly"
   },
   "rules": {
     "updateLinks": "readonly"
   },
   "rules": {

+    "accessor-pairs": "error",
+    "array-callback-return": "error",
+    "block-scoped-var": "error",

     "dot-notation": "error",
     "eqeqeq": ["error", "smart"],
     "keyword-spacing": "error",
     "dot-notation": "error",
     "eqeqeq": ["error", "smart"],
     "keyword-spacing": "error",

+    "no-alert": "warn",

     "no-caller": "error",
     "no-div-regex": "error",
     "no-caller": "error",
     "no-div-regex": "error",

+    "no-eval": "error",

     "no-extend-native": "error",
     "no-extra-bind": "error",
     "no-extend-native": "error",
     "no-extra-bind": "error",

+    "no-extra-label": "error",

     "no-floating-decimal": "error",
     "no-floating-decimal": "error",

+    "no-implicit-coercion": "warn",
+    "no-implicit-globals": "warn",

     "no-implied-eval": "error",
     "no-iterator": "error",
     "no-labels": "error",
     "no-implied-eval": "error",
     "no-iterator": "error",
     "no-labels": "error",


@@ -44,9 +52,13 @@
     "no-shadow-restricted-names": "error",
     "no-throw-literal": "error",
     "no-trailing-spaces": "error",
     "no-shadow-restricted-names": "error",
     "no-throw-literal": "error",
     "no-trailing-spaces": "error",

+    "no-unmodified-loop-condition": "error",

     "no-unneeded-ternary": "error",
     "no-unused-expressions": "off",
     "no-unused-vars": "error",
     "no-unneeded-ternary": "error",
     "no-unused-expressions": "off",
     "no-unused-vars": "error",

+    "no-useless-call": "error",
+    "no-useless-concat": "error",
+    "no-useless-return": "error",

     "no-use-before-define": ["error", {"functions": false}],
     "no-void": "error",
     "no-warning-comments": "warn",
     "no-use-before-define": ["error", {"functions": false}],
     "no-void": "error",
     "no-warning-comments": "warn",


@@ -56,6 +68,8 @@
     "semi": ["error", "always"],
     "semi-spacing": "error",
     "space-unary-ops": "error",
     "semi": ["error", "always"],
     "semi-spacing": "error",
     "space-unary-ops": "error",

-    "wrap-regex": "off"
+    "wrap-iife": "error",
+    "wrap-regex": "error",
+    "yoda": "error"

   }
 }
   }
 }