var noteLayer = map.noteLayer,
content = $('#sidebar_content'),
page = {},
- marker;
+ halo, currentNote;
var noteIcons = {
"new": L.icon({
})
};
- function updateNote(marker, form, method, url) {
+ function updateNote(form, method, url) {
$(form).find("input[type=submit]").prop("disabled", true);
$.ajax({
type: method,
oauth: true,
data: {text: $(form.text).val()},
- success: function (feature) {
- marker = noteLayer.getLayer(marker);
- if (feature.properties.status == "hidden") {
- noteLayer.removeLayer(marker);
- } else {
- marker.setIcon(noteIcons[feature.properties.status]);
- page.load();
- }
+ success: function () {
+ OSM.loadSidebarContent(window.location.pathname, page.load);
}
});
}
- function bind() {
+ 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();
+ });
+ });
+ };
+
+ page.load = function() {
+ initialize(moveToNote);
+ };
+
+ function initialize(callback) {
content.find("input[type=submit]").on("click", function (e) {
e.preventDefault();
var data = $(e.target).data();
- updateNote(data.noteId, e.target.form, data.method, data.url);
+ updateNote(e.target.form, data.method, data.url);
});
content.find("textarea").on("input", function (e) {
});
content.find("textarea").val('').trigger("input");
- }
- page.pushstate = page.popstate = function () {
- page.load();
- };
+ var data = $('.details').data(),
+ latLng = L.latLng(data.coordinates.split(','));
- 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();
+ if (!map.hasLayer(halo)) {
+ halo = L.circleMarker(latLng, {
+ weight: 2.5,
+ radius: 20,
+ fillOpacity: 0.5,
+ color: "#FF6200"
+ });
+ map.addLayer(halo);
+ }
- if (!map.hasLayer(noteLayer)) map.addLayer(noteLayer);
- if (window.location.hash == "") map.panTo($('.details').data().coordinates.split(','));
+ if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
+ currentNote = L.marker(latLng, {
+ icon: noteIcons[data.status],
+ opacity: 1,
+ clickable: true
});
- };
- page.unload = function () {
- if (marker) map.removeLayer(marker);
+ map.addLayer(currentNote);
+
+ if (callback) callback();
};
- function setLoading() {
- if ($('#browse_status').is(':empty')) {
- $('#browse_status').append($('<p></p>').text(I18n.t('browse.start_rjs.loading')));
+ function moveToNote() {
+ var data = $('.details').data(),
+ latLng = L.latLng(data.coordinates.split(','));
+
+ if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
+ OSM.router.moveListenerOff();
+ map.once('moveend', OSM.router.moveListenerOn);
+ map.setView(latLng, 15, {reset: true});
}
}
- function clearLoading() {
- $('#browse_status').empty();
- }
+ page.unload = function () {
+ if (map.hasLayer(halo)) map.removeLayer(halo);
+ if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
+ };
return page;
};