From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Apr 2019 18:39:40 +0000 (+0100)
Subject: Fix new eslint warnings
X-Git-Tag: live~2564^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/176b853174e763f6c25a954e566cedcda8ef6300?hp=d67b0578511e585fabebeb4800cb1706e63b23fb

Fix new eslint warnings
---

diff --git a/app/assets/javascripts/leaflet.zoom.js b/app/assets/javascripts/leaflet.zoom.js
index e7c048b2d..342993347 100644
--- a/app/assets/javascripts/leaflet.zoom.js
+++ b/app/assets/javascripts/leaflet.zoom.js
@@ -1,72 +1,72 @@
 L.OSM.Zoom = L.Control.extend({
-	options: {
-		position: "topright"
-	},
+        options: {
+                position: "topright"
+        },
 
-	onAdd: function (map) {
-		var zoomName = "zoom",
-		    container = L.DomUtil.create("div", zoomName);
+        onAdd: function (map) {
+                var zoomName = "zoom",
+                    container = L.DomUtil.create("div", zoomName);
 
-		this._map = map;
+                this._map = map;
 
-		this._zoomInButton = this._createButton(
-		        "", I18n.t("javascripts.map.zoom.in"), zoomName + "in", container, this._zoomIn, this);
-		this._zoomOutButton = this._createButton(
-		        "", I18n.t("javascripts.map.zoom.out"), zoomName + "out", container, this._zoomOut, this);
+                this._zoomInButton = this._createButton(
+                        "", I18n.t("javascripts.map.zoom.in"), zoomName + "in", container, this._zoomIn, this);
+                this._zoomOutButton = this._createButton(
+                        "", I18n.t("javascripts.map.zoom.out"), zoomName + "out", container, this._zoomOut, this);
 
-		map.on("zoomend zoomlevelschange", this._updateDisabled, this);
+                map.on("zoomend zoomlevelschange", this._updateDisabled, this);
 
-		return container;
-	},
+                return container;
+        },
 
-	onRemove: function (map) {
-		map.off("zoomend zoomlevelschange", this._updateDisabled, this);
-	},
+        onRemove: function (map) {
+                map.off("zoomend zoomlevelschange", this._updateDisabled, this);
+        },
 
-	_zoomIn: function (e) {
-		this._map.zoomIn(e.shiftKey ? 3 : 1);
-	},
+        _zoomIn: function (e) {
+                this._map.zoomIn(e.shiftKey ? 3 : 1);
+        },
 
-	_zoomOut: function (e) {
-		this._map.zoomOut(e.shiftKey ? 3 : 1);
-	},
+        _zoomOut: function (e) {
+                this._map.zoomOut(e.shiftKey ? 3 : 1);
+        },
 
-	_createButton: function (html, title, className, container, fn, context) {
-		var link = L.DomUtil.create("a", "control-button " + className, container);
-		link.innerHTML = html;
-		link.href = "#";
-		link.title = title;
+        _createButton: function (html, title, className, container, fn, context) {
+                var link = L.DomUtil.create("a", "control-button " + className, container);
+                link.innerHTML = html;
+                link.href = "#";
+                link.title = title;
 
-		L.DomUtil.create("span", "icon " + className, link);
+                L.DomUtil.create("span", "icon " + className, link);
 
-		var stop = L.DomEvent.stopPropagation;
+                var stop = L.DomEvent.stopPropagation;
 
-		L.DomEvent
-		    .on(link, "click", stop)
-		    .on(link, "mousedown", stop)
-		    .on(link, "dblclick", stop)
-		    .on(link, "click", L.DomEvent.preventDefault)
-		    .on(link, "click", fn, context);
+                L.DomEvent
+                    .on(link, "click", stop)
+                    .on(link, "mousedown", stop)
+                    .on(link, "dblclick", stop)
+                    .on(link, "click", L.DomEvent.preventDefault)
+                    .on(link, "click", fn, context);
 
-		return link;
-	},
+                return link;
+        },
 
-	_updateDisabled: function () {
-		var map = this._map,
-			className = "disabled";
+        _updateDisabled: function () {
+                var map = this._map,
+                        className = "disabled";
 
-		L.DomUtil.removeClass(this._zoomInButton, className);
-		L.DomUtil.removeClass(this._zoomOutButton, className);
+                L.DomUtil.removeClass(this._zoomInButton, className);
+                L.DomUtil.removeClass(this._zoomOutButton, className);
 
-		if (map._zoom === map.getMinZoom()) {
-			L.DomUtil.addClass(this._zoomOutButton, className);
-		}
-		if (map._zoom === map.getMaxZoom()) {
-			L.DomUtil.addClass(this._zoomInButton, className);
-		}
-	}
+                if (map._zoom === map.getMinZoom()) {
+                        L.DomUtil.addClass(this._zoomOutButton, className);
+                }
+                if (map._zoom === map.getMaxZoom()) {
+                        L.DomUtil.addClass(this._zoomInButton, className);
+                }
+        }
 });
 
 L.OSM.zoom = function (options) {
-	return new L.OSM.Zoom(options);
+        return new L.OSM.Zoom(options);
 };
diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index 08a6c7268..a2a20b846 100644
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -47,7 +47,7 @@
    move the map without the hash changing.
  */
 OSM.Router = function (map, rts) {
-  var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
+  var escapeRegExp  = /[-{}[\]+?.,\\^$|#\s]/g;
   var optionalParam = /\((.*?)\)/g;
   var namedParam    = /(\(\?)?:\w+/g;
   var splatParam    = /\*\w+/g;
@@ -57,7 +57,7 @@ OSM.Router = function (map, rts) {
       path.replace(escapeRegExp, "\\$&")
         .replace(optionalParam, "(?:$1)?")
         .replace(namedParam, function (match, optional) {
-          return optional ? match : "([^\/]+)";
+          return optional ? match : "([^/]+)";
         })
         .replace(splatParam, "(.*?)") + "(?:\\?.*)?$");