X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49..6b843cc15826b521ddf404e5b3a2f7ce91bb8648:/app/assets/javascripts/index/history.js?ds=inline

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index 75b02ec07..8103f047e 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,8 +11,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 +25,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,20 +42,31 @@ OSM.History = function(map) {
     $("#changeset_" + id).removeClass("selected");
   }
 
-  function clickChangeset(id) {
-    OSM.route($("#changeset_" + id).find(".changeset_id").attr("href"));
+  function clickChangeset(id, e) {
+    $("#changeset_" + id).find("a.changeset_id").simulate("click", e);
   }
 
-  function loadData() {
+  function update() {
+    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();
       }
     });
+
+    var feedLink = $('link[type="application/atom+xml"]'),
+      feedHref = feedLink.attr('href').split('?')[0];
+
+    feedLink.attr('href', feedHref + '?bbox=' + data.bbox);
   }
 
   function loadMore(e) {
@@ -95,6 +110,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 +123,19 @@ OSM.History = function(map) {
   };
 
   page.load = function() {
-    map
-      .on("moveend", loadData)
-      .addLayer(group);
+    map.addLayer(group);
 
-    loadData();
+    if (window.location.pathname === '/history') {
+      map.on("moveend", update);
+    }
+
+    update();
   };
 
   page.unload = function() {
-    map
-      .off("moveend", loadData)
-      .removeLayer(group);
+    map.removeLayer(group);
+    map.off("moveend", update);
 
-    group.clearLayers();
     $("#history_tab").removeClass("current");
   };