X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5e9ab5bc5edb63b7ab7719fa989a18f52e3637a2..637799f1f57ab48254a5b6eaa0f78896ae41c456:/app/assets/javascripts/index/notes.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb index 3a2a15393..4538e9968 100644 --- a/app/assets/javascripts/index/notes.js.erb +++ b/app/assets/javascripts/index/notes.js.erb @@ -2,8 +2,7 @@ //= require templates/notes/new function initializeNotes(map) { - var params = OSM.mapParams(), - noteLayer = map.noteLayer, + var noteLayer = map.noteLayer, notes = {}, newNote; @@ -49,20 +48,17 @@ function initializeNotes(map) { } }); - if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { - if (params.notes || params.layers.indexOf('N') >= 0) map.addLayer(noteLayer); - if (params.note) { - $.ajax({ - url: "/api/" + OSM.API_VERSION + "/notes/" + params.note + ".json", - success: function (feature) { - var marker = updateMarker(notes[feature.properties.id], feature); - notes[feature.properties.id] = marker; - map.addLayer(noteLayer); - marker.openPopup(); - } - }); - } - } + noteLayer.showNote = function(id) { + $.ajax({ + url: "/api/" + OSM.API_VERSION + "/notes/" + id + ".json", + success: function (feature) { + var marker = updateMarker(notes[feature.properties.id], feature); + notes[feature.properties.id] = marker; + map.addLayer(noteLayer); + marker.openPopup(); + } + }); + }; function updateMarker(marker, feature) { if (marker) { @@ -160,6 +156,8 @@ function initializeNotes(map) { return content[0]; } + var addNoteButton = $(".control-note .control-button"); + function createNote(marker, form, url) { var location = marker.getLatLng(); @@ -186,7 +184,7 @@ function initializeNotes(map) { notes[feature.properties.id] = updateMarker(marker, feature); newNote = null; - $("#createnoteanchor").removeClass("disabled").addClass("geolink"); + addNoteButton.removeClass("active"); } } @@ -215,12 +213,14 @@ function initializeNotes(map) { }); } - $(".leaflet-control-attribution").on("click", "#createnoteanchor", function (e) { + addNoteButton.on("click", function (e) { e.preventDefault(); + e.stopPropagation(); - if ($(e.target).hasClass("disabled")) return; + if (addNoteButton.hasClass("disabled")) return; + if (addNoteButton.hasClass("active")) return; - $(e.target).removeClass("geolink").addClass("disabled"); + addNoteButton.addClass("active"); map.addLayer(noteLayer); @@ -241,25 +241,23 @@ function initializeNotes(map) { draggable: true }); - var popupContent = $(JST["templates/notes/new"]({ - create_url: $(e.target).attr("href") - })); + var popupContent = $(JST["templates/notes/new"]()); popupContent.find("textarea").on("input", disableWhenBlank); function disableWhenBlank(e) { - $(e.target.form).prop("disabled", $(e.target).val() === ""); + $(e.target.form.add).prop("disabled", $(e.target).val() === ""); } popupContent.find("input[type=submit]").on("click", function (e) { e.preventDefault(); - createNote(newNote, e.target.form, $(e.target).data("url")); + createNote(newNote, e.target.form, '/api/0.6/notes.json'); }); newNote.addTo(noteLayer).bindPopup(popupContent[0], popupOptions()).openPopup(); newNote.on("remove", function (e) { - $("#createnoteanchor").removeClass("disabled").addClass("geolink"); + addNoteButton.removeClass("active"); }).on("dragstart", function (e) { $(newNote).stopTime("removenote"); }).on("dragend", function (e) {