From eb7678145a87c1b9e3cd7ff2d3b5dc08132e4b51 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 6 Apr 2019 15:59:34 +0100 Subject: [PATCH] Use double quotes consistently in javascript code --- app/assets/javascripts/application.js | 20 +- app/assets/javascripts/diary_entry.js | 6 +- app/assets/javascripts/fixthemap.js | 4 +- app/assets/javascripts/id.js | 12 +- app/assets/javascripts/index.js | 116 ++--- app/assets/javascripts/index/browse.js | 18 +- app/assets/javascripts/index/changeset.js | 6 +- app/assets/javascripts/index/directions.js | 98 ++--- .../javascripts/index/directions/fossgis.js | 146 +++---- .../index/directions/graphhopper.js | 2 +- app/assets/javascripts/index/history.js | 20 +- app/assets/javascripts/index/new_note.js | 16 +- app/assets/javascripts/index/note.js | 16 +- app/assets/javascripts/index/notes.js | 4 +- app/assets/javascripts/index/query.js | 6 +- app/assets/javascripts/index/search.js | 8 +- app/assets/javascripts/leaflet.key.js | 68 +-- app/assets/javascripts/leaflet.layers.js | 144 +++---- app/assets/javascripts/leaflet.map.js | 28 +- app/assets/javascripts/leaflet.note.js | 22 +- app/assets/javascripts/leaflet.query.js | 28 +- app/assets/javascripts/leaflet.share.js | 398 +++++++++--------- app/assets/javascripts/leaflet.sidebar.js | 8 +- app/assets/javascripts/leaflet.zoom.js | 32 +- app/assets/javascripts/oauth.js | 2 +- app/assets/javascripts/router.js | 40 +- app/assets/javascripts/user.js | 30 +- app/assets/javascripts/welcome.js | 14 +- config/eslint.json | 1 + 29 files changed, 657 insertions(+), 656 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ebb0ff580..d73b3c69c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,7 +17,7 @@ //= require richtext //= require querystring -var querystring = require('querystring-component'); +var querystring = require("querystring-component"); /* * Called as the user scrolls/zooms around to maniplate hrefs of the @@ -39,11 +39,11 @@ window.updateLinks = function (loc, zoom, layers, object) { } var query = querystring.stringify(args); - if (query) href += '?' + query; + if (query) href += "?" + query; args = { lat: loc.lat, - lon: 'lon' in loc ? loc.lon : loc.lng, + lon: "lon" in loc ? loc.lon : loc.lng, zoom: zoom }; @@ -57,13 +57,13 @@ window.updateLinks = function (loc, zoom, layers, object) { }); var editDisabled = zoom < 13; - $('#edit_tab') - .tooltip({placement: 'bottom'}) - .off('click.minzoom') - .on('click.minzoom', function() { return !editDisabled; }) - .toggleClass('disabled', editDisabled) - .attr('data-original-title', editDisabled ? - I18n.t('javascripts.site.edit_disabled_tooltip') : ''); + $("#edit_tab") + .tooltip({placement: "bottom"}) + .off("click.minzoom") + .on("click.minzoom", function() { return !editDisabled; }) + .toggleClass("disabled", editDisabled) + .attr("data-original-title", editDisabled ? + I18n.t("javascripts.site.edit_disabled_tooltip") : ""); }; window.maximiseMap = function () { diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js index f13706971..73a179ba9 100644 --- a/app/assets/javascripts/diary_entry.js +++ b/app/assets/javascripts/diary_entry.js @@ -10,7 +10,7 @@ $(document).ready(function () { } marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map) - .bindPopup(I18n.t('diary_entries.edit.marker_text')); + .bindPopup(I18n.t("diary_entries.edit.marker_text")); } $("#usemap").click(function (e) { @@ -21,7 +21,7 @@ $(document).ready(function () { var params = $("#map").data(); var centre = [params.lat, params.lon]; - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; map = L.map("map", { attributionControl: false, @@ -35,7 +35,7 @@ $(document).ready(function () { if ($("#latitude").val() && $("#longitude").val()) { marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map) - .bindPopup(I18n.t('diary_entries.edit.marker_text')); + .bindPopup(I18n.t("diary_entries.edit.marker_text")); } map.on("click", setLocation); diff --git a/app/assets/javascripts/fixthemap.js b/app/assets/javascripts/fixthemap.js index e2a503ad3..9bfb01ad5 100644 --- a/app/assets/javascripts/fixthemap.js +++ b/app/assets/javascripts/fixthemap.js @@ -1,12 +1,12 @@ $(document).ready(function() { var params = OSM.params(); - var url = '/note/new'; + var url = "/note/new"; if (params.lat && params.lon) { params.lat = parseFloat(params.lat); params.lon = parseFloat(params.lon); params.zoom = params.zoom || 17; url += OSM.formatHash(params); } - $('.icon.note').attr('href', url); + $(".icon.note").attr("href", url); }); diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index dd7cd3325..fbe810d28 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -5,11 +5,11 @@ document.addEventListener("DOMContentLoaded", function() { var container = document.getElementById("id-container"); - if (typeof iD === 'undefined' || !iD.Detect().support) { - container.innerHTML = 'This editor is supported ' + - 'in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. ' + - 'Please upgrade your browser or use Potlatch 2 to edit the map.'; - container.className = 'unsupported'; + if (typeof iD === "undefined" || !iD.Detect().support) { + container.innerHTML = "This editor is supported " + + "in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " + + "Please upgrade your browser or use Potlatch 2 to edit the map."; + container.className = "unsupported"; } else { var id = iD.Context() .embed(true) @@ -24,7 +24,7 @@ document.addEventListener("DOMContentLoaded", function() { oauth_token_secret: container.dataset.tokenSecret }); - id.map().on('move.embed', parent.$.throttle(250, function() { + id.map().on("move.embed", parent.$.throttle(250, function() { if (id.inIntro()) return; var zoom = ~~id.map().zoom(), center = id.map().center(), diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 2678ba282..cce07f324 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -37,18 +37,18 @@ $(document).ready(function () { clearTimeout(loaderTimeout); loaderTimeout = setTimeout(function() { - $('#sidebar_loader').show(); + $("#sidebar_loader").show(); }, 200); // IE<10 doesn't respect Vary: X-Requested-With header, so // prevent caching the XHR response as a full-page URL. - if (path.indexOf('?') >= 0) { - path += '&xhr=1'; + if (path.indexOf("?") >= 0) { + path += "&xhr=1"; } else { - path += '?xhr=1'; + path += "?xhr=1"; } - $('#sidebar_content') + $("#sidebar_content") .empty(); $.ajax({ @@ -56,24 +56,24 @@ $(document).ready(function () { dataType: "html", complete: function(xhr) { clearTimeout(loaderTimeout); - $('#flash').empty(); - $('#sidebar_loader').hide(); + $("#flash").empty(); + $("#sidebar_loader").hide(); var content = $(xhr.responseText); - if (xhr.getResponseHeader('X-Page-Title')) { - var title = xhr.getResponseHeader('X-Page-Title'); + if (xhr.getResponseHeader("X-Page-Title")) { + var title = xhr.getResponseHeader("X-Page-Title"); document.title = decodeURIComponent(title); } - $('head') - .find('link[type="application/atom+xml"]') + $("head") + .find("link[type=\"application/atom+xml\"]") .remove(); - $('head') - .append(content.filter('link[type="application/atom+xml"]')); + $("head") + .append(content.filter("link[type=\"application/atom+xml\"]")); - $('#sidebar_content').html(content.not('link[type="application/atom+xml"]')); + $("#sidebar_content").html(content.not("link[type=\"application/atom+xml\"]")); if (callback) { callback(); @@ -84,7 +84,7 @@ $(document).ready(function () { var params = OSM.mapParams(); - map.attributionControl.setPrefix(''); + map.attributionControl.setPrefix(""); map.updateLayers(params.layers); @@ -94,32 +94,32 @@ $(document).ready(function () { } }); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; L.OSM.zoom({position: position}) .addTo(map); var locate = L.control.locate({ position: position, - icon: 'icon geolocate', - iconLoading: 'icon geolocate', + icon: "icon geolocate", + iconLoading: "icon geolocate", strings: { - title: I18n.t('javascripts.map.locate.title'), - popup: I18n.t('javascripts.map.locate.popup') + title: I18n.t("javascripts.map.locate.title"), + popup: I18n.t("javascripts.map.locate.popup") } }).addTo(map); var locateContainer = locate.getContainer(); $(locateContainer) - .removeClass('leaflet-control-locate leaflet-bar') - .addClass('control-locate') + .removeClass("leaflet-control-locate leaflet-bar") + .addClass("control-locate") .children("a") - .attr('href', '#') - .removeClass('leaflet-bar-part leaflet-bar-part-single') - .addClass('control-button'); + .attr("href", "#") + .removeClass("leaflet-bar-part leaflet-bar-part-single") + .addClass("control-button"); - var sidebar = L.OSM.sidebar('#map-ui') + var sidebar = L.OSM.sidebar("#map-ui") .addTo(map); L.OSM.layers({ @@ -154,7 +154,7 @@ $(document).ready(function () { OSM.initializeContextMenu(map); - if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') { + if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") { OSM.initializeNotes(map); if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { map.addLayer(map.noteLayer); @@ -170,51 +170,51 @@ $(document).ready(function () { } } - var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left'; - $('.leaflet-control .control-button').tooltip({placement: placement, container: 'body'}); + var placement = $("html").attr("dir") === "rtl" ? "right" : "left"; + $(".leaflet-control .control-button").tooltip({placement: placement, container: "body"}); var expiry = new Date(); expiry.setYear(expiry.getFullYear() + 10); - map.on('moveend layeradd layerremove', function() { + map.on("moveend layeradd layerremove", function() { updateLinks( map.getCenter().wrap(), map.getZoom(), map.getLayersCode(), map._object); - $.removeCookie('_osm_location'); - $.cookie('_osm_location', OSM.locationCookie(map), { expires: expiry, path: '/' }); + $.removeCookie("_osm_location"); + $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); - if ($.cookie('_osm_welcome') !== 'hide') { - $('.welcome').addClass('visible'); + if ($.cookie("_osm_welcome") !== "hide") { + $(".welcome").addClass("visible"); } - $('.welcome .close-wrap').on('click', function() { - $('.welcome').removeClass('visible'); - $.cookie('_osm_welcome', 'hide', { expires: expiry, path: '/' }); + $(".welcome .close-wrap").on("click", function() { + $(".welcome").removeClass("visible"); + $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" }); }); var bannerExpiry = new Date(); bannerExpiry.setYear(bannerExpiry.getFullYear() + 1); - $('#banner .close-wrap').on('click', function(e) { + $("#banner .close-wrap").on("click", function(e) { var cookieId = e.target.id; - $('#banner').hide(); + $("#banner").hide(); e.preventDefault(); if (cookieId) { - $.cookie(cookieId, 'hide', { expires: bannerExpiry, path: '/' }); + $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" }); } }); if (OSM.PIWIK) { - map.on('layeradd', function (e) { + map.on("layeradd", function (e) { if (e.layer.options) { var goal = OSM.PIWIK.goals[e.layer.options.keyid]; if (goal) { - $('body').trigger('piwikgoal', goal); + $("body").trigger("piwikgoal", goal); } } }); @@ -250,7 +250,7 @@ $(document).ready(function () { bottom: bbox.getSouth() - 0.0001 }; - if (location.protocol === 'http' || + if (location.protocol === "http" || bowser.check({chrome: "53", firefox: "55"})) { url = "http://127.0.0.1:8111/load_and_zoom?"; } else { @@ -259,18 +259,18 @@ $(document).ready(function () { if (object) query.select = object.type + object.id; - var iframe = $('
' + - '' + - escapeHTML(I18n.t('javascripts.share.view_larger_map')) + ''); + $("#embed_html").val( + "
" + + "" + + escapeHTML(I18n.t("javascripts.share.view_larger_map")) + ""); // Geo URI - $('#geo_uri') - .attr('href', map.getGeoUri(marker)) + $("#geo_uri") + .attr("href", map.getGeoUri(marker)) .html(map.getGeoUri(marker)); // Image @@ -368,10 +368,10 @@ L.OSM.share = function (options) { L.CRS.EPSG3857.project(bounds.getNorthEast())).getSize(), maxScale = Math.floor(Math.sqrt(size.x * size.y / 0.3136)); - $('#mapnik_minlon').val(bounds.getWest()); - $('#mapnik_minlat').val(bounds.getSouth()); - $('#mapnik_maxlon').val(bounds.getEast()); - $('#mapnik_maxlat').val(bounds.getNorth()); + $("#mapnik_minlon").val(bounds.getWest()); + $("#mapnik_minlat").val(bounds.getSouth()); + $("#mapnik_maxlon").val(bounds.getEast()); + $("#mapnik_maxlat").val(bounds.getNorth()); if (scale < maxScale) { scale = roundScale(maxScale); @@ -381,12 +381,12 @@ L.OSM.share = function (options) { $("#mapnik_image_width").text(Math.round(size.x / scale / 0.00028)); $("#mapnik_image_height").text(Math.round(size.y / scale / 0.00028)); - if (map.getMapBaseLayerId() === 'mapnik') { - $('#export-image').show(); - $('#export-warning').hide(); + if (map.getMapBaseLayerId() === "mapnik") { + $("#export-image").show(); + $("#export-warning").hide(); } else { - $('#export-image').hide(); - $('#export-warning').show(); + $("#export-image").hide(); + $("#export-warning").show(); } } diff --git a/app/assets/javascripts/leaflet.sidebar.js b/app/assets/javascripts/leaflet.sidebar.js index f83add8d5..240e79a50 100644 --- a/app/assets/javascripts/leaflet.sidebar.js +++ b/app/assets/javascripts/leaflet.sidebar.js @@ -19,10 +19,10 @@ L.OSM.sidebar = function(selector) { control.togglePane = function(pane, button) { current .hide() - .trigger('hide'); + .trigger("hide"); currentButton - .removeClass('active'); + .removeClass("active"); if (current === pane) { $(sidebar).hide(); @@ -37,10 +37,10 @@ L.OSM.sidebar = function(selector) { current .show() - .trigger('show'); + .trigger("show"); currentButton - .addClass('active'); + .addClass("active"); }; return control; diff --git a/app/assets/javascripts/leaflet.zoom.js b/app/assets/javascripts/leaflet.zoom.js index 794bfaf4b..e7c048b2d 100644 --- a/app/assets/javascripts/leaflet.zoom.js +++ b/app/assets/javascripts/leaflet.zoom.js @@ -1,26 +1,26 @@ L.OSM.Zoom = L.Control.extend({ options: { - position: 'topright' + position: "topright" }, onAdd: function (map) { - var zoomName = 'zoom', - container = L.DomUtil.create('div', zoomName); + var zoomName = "zoom", + container = L.DomUtil.create("div", zoomName); this._map = map; this._zoomInButton = this._createButton( - '', I18n.t('javascripts.map.zoom.in'), zoomName + 'in', container, this._zoomIn, this); + "", 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); + "", 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; }, onRemove: function (map) { - map.off('zoomend zoomlevelschange', this._updateDisabled, this); + map.off("zoomend zoomlevelschange", this._updateDisabled, this); }, _zoomIn: function (e) { @@ -32,28 +32,28 @@ L.OSM.Zoom = L.Control.extend({ }, _createButton: function (html, title, className, container, fn, context) { - var link = L.DomUtil.create('a', 'control-button ' + className, container); + var link = L.DomUtil.create("a", "control-button " + className, container); link.innerHTML = html; - link.href = '#'; + link.href = "#"; link.title = title; - L.DomUtil.create('span', 'icon ' + className, link); + L.DomUtil.create("span", "icon " + className, link); 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); + .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; }, _updateDisabled: function () { var map = this._map, - className = 'disabled'; + className = "disabled"; L.DomUtil.removeClass(this._zoomInButton, className); L.DomUtil.removeClass(this._zoomOutButton, className); diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js index 037e1d730..cb448d826 100644 --- a/app/assets/javascripts/oauth.js +++ b/app/assets/javascripts/oauth.js @@ -4,7 +4,7 @@ $(document).ready(function () { var application_data = $("head").data(); function makeAbsolute(url) { - var a = document.createElement('a'); + var a = document.createElement("a"); a.href = url; return a.href; } diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index 0f37e32f1..c42e703c5 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -53,13 +53,13 @@ OSM.Router = function(map, rts) { var splatParam = /\*\w+/g; function Route(path, controller) { - var regexp = new RegExp('^' + - path.replace(escapeRegExp, '\\$&') - .replace(optionalParam, '(?:$1)?') + var regexp = new RegExp("^" + + path.replace(escapeRegExp, "\\$&") + .replace(optionalParam, "(?:$1)?") .replace(namedParam, function(match, optional){ - return optional ? match : '([^\/]+)'; + return optional ? match : "([^\/]+)"; }) - .replace(splatParam, '(.*?)') + '(?:\\?.*)?$'); + .replace(splatParam, "(.*?)") + "(?:\\?.*)?$"); var route = {}; @@ -94,36 +94,36 @@ OSM.Router = function(map, rts) { } }; - var currentPath = window.location.pathname.replace(/(.)\/$/, '$1') + window.location.search, + var currentPath = window.location.pathname.replace(/(.)\/$/, "$1") + window.location.search, currentRoute = routes.recognize(currentPath), currentHash = location.hash || OSM.formatHash(map); var router = {}; if (window.history && window.history.pushState) { - $(window).on('popstate', function(e) { + $(window).on("popstate", function(e) { if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change? var path = window.location.pathname + window.location.search, route = routes.recognize(path); if (path === currentPath) return; - currentRoute.run('unload', null, route === currentRoute); + currentRoute.run("unload", null, route === currentRoute); currentPath = path; currentRoute = route; - currentRoute.run('popstate', currentPath); + currentRoute.run("popstate", currentPath); map.setState(e.originalEvent.state, {animate: false}); }); router.route = function (url) { - var path = url.replace(/#.*/, ''), + var path = url.replace(/#.*/, ""), route = routes.recognize(path); if (!route) return false; - currentRoute.run('unload', null, route === currentRoute); + currentRoute.run("unload", null, route === currentRoute); var state = OSM.parseHash(url); map.setState(state); window.history.pushState(state, document.title, url); currentPath = path; currentRoute = route; - currentRoute.run('pushstate', currentPath); + currentRoute.run("pushstate", currentPath); return true; }; @@ -166,19 +166,19 @@ OSM.Router = function(map, rts) { router.withoutMoveListener = function (callback) { function disableMoveListener() { - map.off('moveend', router.updateHash); - map.once('moveend', function () { - map.on('moveend', router.updateHash); + map.off("moveend", router.updateHash); + map.once("moveend", function () { + map.on("moveend", router.updateHash); }); } - map.once('movestart', disableMoveListener); + map.once("movestart", disableMoveListener); callback(); - map.off('movestart', disableMoveListener); + map.off("movestart", disableMoveListener); }; router.load = function() { - var loadState = currentRoute.run('load', currentPath); + var loadState = currentRoute.run("load", currentPath); router.stateChange(loadState || {}); }; @@ -187,8 +187,8 @@ OSM.Router = function(map, rts) { currentRoute = routes.recognize(currentPath); }; - map.on('moveend baselayerchange overlaylayerchange', router.updateHash); - $(window).on('hashchange', router.hashUpdated); + map.on("moveend baselayerchange overlaylayerchange", router.updateHash); + $(window).on("hashchange", router.hashUpdated); return router; }; diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index bdf044305..73bb2406e 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -7,30 +7,30 @@ $(document).ready(function () { zoomControl: false }).addLayer(new L.OSM.Mapnik()); - var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; L.OSM.zoom({position: position}) .addTo(map); var locate = L.control.locate({ position: position, - icon: 'icon geolocate', - iconLoading: 'icon geolocate', + icon: "icon geolocate", + iconLoading: "icon geolocate", strings: { - title: I18n.t('javascripts.map.locate.title'), - popup: I18n.t('javascripts.map.locate.popup') + title: I18n.t("javascripts.map.locate.title"), + popup: I18n.t("javascripts.map.locate.popup") } }).addTo(map); var locateContainer = locate.getContainer(); $(locateContainer) - .removeClass('leaflet-control-locate leaflet-bar') - .addClass('control-locate') + .removeClass("leaflet-control-locate leaflet-bar") + .addClass("control-locate") .children("a") - .attr('href', '#') - .removeClass('leaflet-bar-part leaflet-bar-part-single') - .addClass('control-button'); + .attr("href", "#") + .removeClass("leaflet-bar-part leaflet-bar-part-single") + .addClass("control-button"); if (OSM.home) { map.setView([OSM.home.lat, OSM.home.lon], 12); @@ -47,14 +47,14 @@ $(document).ready(function () { } map.on("click", function (e) { - if ($('#updatehome').is(':checked')) { + if ($("#updatehome").is(":checked")) { var zoom = map.getZoom(), precision = OSM.zoomPrecision(zoom), location = e.latlng.wrap(); - $('#homerow').removeClass(); - $('#home_lat').val(location.lat.toFixed(precision)); - $('#home_lon').val(location.lng.toFixed(precision)); + $("#homerow").removeClass(); + $("#home_lat").val(location.lat.toFixed(precision)); + $("#home_lon").val(location.lng.toFixed(precision)); marker.setLatLng(e.latlng); marker.addTo(map); @@ -62,7 +62,7 @@ $(document).ready(function () { }); } else { $("[data-user]").each(function () { - var user = $(this).data('user'); + var user = $(this).data("user"); if (user.lon && user.lat) { L.marker([user.lat, user.lon], {icon: OSM.getUserIcon(user.icon)}).addTo(map) .bindPopup(user.description); diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 5ba0d7cd2..c83d153da 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -6,28 +6,28 @@ $(document).ready(function() { params.lon = parseFloat(params.lon); params.zoom = params.zoom || 17; - var url = '/edit'; + var url = "/edit"; if (params.editor) { - url += '?editor=' + params.editor; + url += "?editor=" + params.editor; } url += OSM.formatHash(params); - $('.start-mapping').attr('href', url); + $(".start-mapping").attr("href", url); } else { var geoSuccess = function (position) { - window.location = '/edit' + OSM.formatHash({ + window.location = "/edit" + OSM.formatHash({ zoom: 17, lat: position.coords.latitude, lon: position.coords.longitude }); }; - $('.start-mapping').on('click', function(e) { + $(".start-mapping").on("click", function(e) { e.preventDefault(); - $('.start-mapping').addClass('loading'); + $(".start-mapping").addClass("loading"); if (navigator.geolocation) { // handle firefox's weird implementation @@ -42,6 +42,6 @@ $(document).ready(function() { } function manualEdit() { - window.location = '/?edit_help=1'; + window.location = "/?edit_help=1"; } }); diff --git a/config/eslint.json b/config/eslint.json index b37ec6410..5b058e354 100644 --- a/config/eslint.json +++ b/config/eslint.json @@ -51,6 +51,7 @@ "no-void": "error", "no-warning-comments": "warn", "no-with": "error", + "quotes": ["error", "double"], "radix": ["error", "always"], "semi": ["error", "always"], "semi-spacing": "error", -- 2.39.5