X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5a330c7b9dbba5039312d901fec52ed80ad73409..691352136ab17e4a84394a5b80e758c8a1ce92a0:/app/assets/javascripts/index/history.js diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index 75b02ec07..27774f05b 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -9,8 +9,10 @@ OSM.History = function(map) { .on("mouseout", "[data-changeset]", function () { unHighlightChangeset($(this).data("changeset").id); }) - .on("click", "[data-changeset]", function () { - clickChangeset($(this).data("changeset").id); + .on("click", "[data-changeset]", function (e) { + if (!$(e.target).is('a')) { + clickChangeset($(this).data("changeset").id, e); + } }); var group = L.featureGroup() @@ -21,7 +23,7 @@ OSM.History = function(map) { unHighlightChangeset(e.layer.id); }) .on("click", function (e) { - clickChangeset(e.layer.id); + clickChangeset(e.layer.id, e); }); group.getLayerId = function(layer) { @@ -38,15 +40,44 @@ OSM.History = function(map) { $("#changeset_" + id).removeClass("selected"); } - function clickChangeset(id) { - OSM.route($("#changeset_" + id).find(".changeset_id").attr("href")); + function clickChangeset(id, e) { + var evt, el = $("#changeset_" + id).find("a.changeset_id")[0]; + if ('createEvent' in document) { + evt = document.createEvent('MouseEvents'); + evt.initMouseEvent('click', + true, // canBubble + true, // cancelable + window, // 'AbstractView' + e.clicks, // click count + e.screenX, // screenX + e.screenY, // screenY + e.clientX, // clientX + e.clientY, // clientY + e.ctrlKey, // ctrl + e.altKey, // alt + e.shiftKey, // shift + e.metaKey, // meta + e.button, // mouse button + e.relatedTarget // relatedTarget + ); + el.dispatchEvent(evt); + } else { + evt = document.createEventObject(); + el.fireEvent('onclick', evt); + } } function loadData() { + var data = {list: '1'}; + + if (window.location.pathname === '/history') { + data.bbox = map.getBounds().wrap().toBBoxString(); + } + $.ajax({ url: window.location.pathname, method: "GET", - data: {bbox: map.getBounds().wrap().toBBoxString()}, + data: data, success: function(html, status, xhr) { $('#sidebar_content .changesets').html(html); updateMap(); @@ -95,6 +126,11 @@ OSM.History = function(map) { rect.id = changeset.id; rect.addTo(group); } + + if (window.location.pathname !== '/history') { + var bounds = group.getBounds(); + if (bounds.isValid()) map.fitBounds(bounds); + } } page.pushstate = page.popstate = function(path) { @@ -103,19 +139,22 @@ OSM.History = function(map) { }; page.load = function() { - map - .on("moveend", loadData) - .addLayer(group); + map.addLayer(group); + + if (window.location.pathname === '/history') { + map.on("moveend", loadData) + } loadData(); }; page.unload = function() { - map - .off("moveend", loadData) - .removeLayer(group); + map.removeLayer(group); + + if (window.location.pathname === '/history') { + map.off("moveend", loadData) + } - group.clearLayers(); $("#history_tab").removeClass("current"); };