X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/528d4a040e593f6ce2171167c436dbdf27511711..1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8:/app/assets/javascripts/index/history.js diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index 27774f05b..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 = {}; @@ -9,10 +11,15 @@ OSM.History = function(map) { .on("mouseout", "[data-changeset]", function () { unHighlightChangeset($(this).data("changeset").id); }) - .on("click", "[data-changeset]", function (e) { - if (!$(e.target).is('a')) { - clickChangeset($(this).data("changeset").id, e); - } + .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() @@ -41,33 +48,10 @@ OSM.History = function(map) { } 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); - } + $("#changeset_" + id).find("a.changeset_id").simulate("click", e); } - function loadData() { + function update() { var data = {list: '1'}; if (window.location.pathname === '/history') { @@ -83,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) { @@ -142,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"); };