X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e256c837b56d9f1c40c0c57dd89db4825bc7489e..45e560bef6ecc7702597ce04c781a59bb688ebc4:/app/assets/javascripts/index/note.js?ds=sidebyside diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js index 2d4a8decf..3793c573e 100644 --- a/app/assets/javascripts/index/note.js +++ b/app/assets/javascripts/index/note.js @@ -1,8 +1,7 @@ OSM.Note = function (map) { - var noteLayer = map.noteLayer, - content = $('#sidebar_content'), - page = {}, - halo, currentNote; + var content = $("#sidebar_content"), + page = {}, + halo, currentNote; var noteIcons = { "new": L.icon({ @@ -29,7 +28,7 @@ OSM.Note = function (map) { url: url, type: method, oauth: true, - data: {text: $(form.text).val()}, + data: { text: $(form.text).val() }, success: function () { OSM.loadSidebarContent(window.location.pathname, page.load); } @@ -37,16 +36,16 @@ OSM.Note = function (map) { } page.pushstate = page.popstate = function (path) { - OSM.loadSidebarContent(path, function() { - initialize(function() { - var data = $('.details').data(), - latLng = L.latLng(data.coordinates.split(',')); - if (!map.getBounds().contains(latLng)) moveToNote(); + OSM.loadSidebarContent(path, function () { + initialize(function () { + var data = $(".details").data(), + latLng = L.latLng(data.coordinates.split(",")); + if (!map.getBounds().contains(latLng)) moveToNote(); }); }); }; - page.load = function() { + page.load = function () { initialize(moveToNote); }; @@ -60,7 +59,7 @@ OSM.Note = function (map) { content.find("textarea").on("input", function (e) { var form = e.target.form; - if ($(e.target).val() == "") { + if ($(e.target).val() === "") { $(form.close).val(I18n.t("javascripts.notes.show.resolve")); $(form.comment).prop("disabled", true); } else { @@ -69,10 +68,10 @@ OSM.Note = function (map) { } }); - content.find("textarea").val('').trigger("input"); + content.find("textarea").val("").trigger("input"); - var data = $('.details').data(), - latLng = L.latLng(data.coordinates.split(',')); + var data = $(".details").data(), + latLng = L.latLng(data.coordinates.split(",")); if (!map.hasLayer(halo)) { halo = L.circleMarker(latLng, { @@ -88,21 +87,21 @@ OSM.Note = function (map) { currentNote = L.marker(latLng, { icon: noteIcons[data.status], opacity: 1, - clickable: true + interactive: true }); map.addLayer(currentNote); if (callback) callback(); - }; + } function moveToNote() { - var data = $('.details').data(), - latLng = L.latLng(data.coordinates.split(',')); + var data = $(".details").data(), + latLng = L.latLng(data.coordinates.split(",")); if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) { OSM.router.withoutMoveListener(function () { - map.setView(latLng, 15, {reset: true}); + map.setView(latLng, 15, { reset: true }); }); } }