X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9e25f5563d87fd6bce5b1679790d6d9c9e34e875..321218f9b1b08451cd4fa4ea67b2a91189eeb37d:/app/assets/javascripts/index/history.js diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index cb2ef6d0c..cb1f6f8d5 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -1,3 +1,5 @@ +//= require jquery.simulate + OSM.History = function(map) { var page = {}; @@ -8,6 +10,16 @@ OSM.History = function(map) { }) .on("mouseout", "[data-changeset]", function () { unHighlightChangeset($(this).data("changeset").id); + }) + .on("mousedown", "[data-changeset]", function () { + var moved = false; + $(this).one("click", function (e) { + if (!moved && !$(e.target).is('a')) { + clickChangeset($(this).data("changeset").id, e); + } + }).one("mousemove", function () { + moved = true; + }); }); var group = L.featureGroup() @@ -18,7 +30,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) { @@ -35,15 +47,15 @@ OSM.History = function(map) { $("#changeset_" + id).removeClass("selected"); } - function clickChangeset(id) { - OSM.router.route($("#changeset_" + id).find(".changeset_id").attr("href")); + function clickChangeset(id, e) { + $("#changeset_" + id).find("a.changeset_id").simulate("click", e); } - function loadData() { - var data = {}; + function update() { + var data = {list: '1'}; if (window.location.pathname === '/history') { - data = {bbox: map.getBounds().wrap().toBBoxString()}; + data.bbox = map.getBounds().wrap().toBBoxString(); } $.ajax({ @@ -55,6 +67,11 @@ OSM.History = function(map) { updateMap(); } }); + + var feedLink = $('link[type="application/atom+xml"]'), + feedHref = feedLink.attr('href').split('?')[0]; + + feedLink.attr('href', feedHref + '?bbox=' + data.bbox); } function loadMore(e) { @@ -114,18 +131,15 @@ OSM.History = function(map) { map.addLayer(group); if (window.location.pathname === '/history') { - map.on("moveend", loadData) + map.on("moveend", update); } - loadData(); + update(); }; page.unload = function() { map.removeLayer(group); - - if (window.location.pathname === '/history') { - map.off("moveend", loadData) - } + map.off("moveend", update); $("#history_tab").removeClass("current"); };