X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ecb8dbe8e870096ec38bc628d0e3d34c490f051..8fe5dbb92cec25467f1f1c23f65113c5e956a7ff:/app/assets/javascripts/index/note.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/index/note.js.erb b/app/assets/javascripts/index/note.js.erb index afc230067..09044bf0e 100644 --- a/app/assets/javascripts/index/note.js.erb +++ b/app/assets/javascripts/index/note.js.erb @@ -38,12 +38,16 @@ OSM.Note = function (map) { } else if (marker) { marker.setIcon(noteIcons[feature.properties.status]); } - page.load(); + OSM.loadSidebarContent(window.location.pathname, page.load); } }); } - function bind() { + page.pushstate = page.popstate = function (path) { + OSM.loadSidebarContent(path, page.load); + }; + + page.load = function () { content.find("input[type=submit]").on("click", function (e) { e.preventDefault(); var data = $(e.target).data(); @@ -63,34 +67,26 @@ OSM.Note = function (map) { }); content.find("textarea").val('').trigger("input"); - } - page.pushstate = page.popstate = function () { - page.load(); - }; - - page.load = function () { - var loadTimer = setTimeout(setLoading, 250); - $('#sidebar_content').load(window.location.pathname + "?xhr=1", function (a, b, xhr) { - if (xhr.getResponseHeader('X-Page-Title')) { - document.title = xhr.getResponseHeader('X-Page-Title'); - } - bind(); - clearTimeout(loadTimer); - clearLoading(); + var data = $('.details').data(); + if (!noteState) map.addLayer(noteLayer); + if (!window.location.hash) { + var coords = data.coordinates.split(','); + OSM.route.moveListenerOff(); + map.once('moveend', OSM.route.moveListenerOn); - var data = $('.details').data(); - if (!noteState) map.addLayer(noteLayer); - if (window.location.hash == "") map.panTo(data.coordinates.split(',')); + map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16); + } - if (!map.hasLayer(halo)) { - halo = L.circleMarker(data.coordinates.split(','), { - weight: 2.5, - radius: 20 - }); - map.addLayer(halo); - } - }); + if (!map.hasLayer(halo)) { + halo = L.circleMarker(data.coordinates.split(','), { + weight: 2.5, + radius: 20, + fillOpacity: 0.5, + color: "#FF6200" + }); + map.addLayer(halo); + } }; page.unload = function () { @@ -98,15 +94,5 @@ OSM.Note = function (map) { if (!noteState) map.removeLayer(noteLayer); }; - function setLoading() { - if ($('#browse_status').is(':empty')) { - $('#browse_status').append($('

').text(I18n.t('browse.start_rjs.loading'))); - } - } - - function clearLoading() { - $('#browse_status').empty(); - } - return page; };