Merge remote-tracking branch 'upstream/pull/5289'

[rails.git] / app / assets / javascripts / index / history.js

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index ed0ff3d9aada28cdcd4652aab4512ec6d4367695..c6ba0c2edc9831853eedfec9f533531d71d5f341 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -1,4 +1,4 @@
-//= require jquery.simulate
+//= require jquery-simulate/jquery.simulate

 
 OSM.History = function (map) {
   var page = {};
 
 OSM.History = function (map) {
   var page = {};


@@ -10,18 +10,6 @@ OSM.History = function (map) {
     })
     .on("mouseout", "[data-changeset]", function () {
       unHighlightChangeset($(this).data("changeset").id);
     })
     .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()
     });
 
   var group = L.featureGroup()


@@ -32,7 +20,7 @@ OSM.History = function (map) {
       unHighlightChangeset(e.layer.id);
     })
     .on("click", function (e) {
       unHighlightChangeset(e.layer.id);
     })
     .on("click", function (e) {

-      clickChangeset(e.layer.id, e);
+      clickChangeset(e.layer.id, e.originalEvent);

     });
 
   group.getLayerId = function (layer) {
     });
 
   group.getLayerId = function (layer) {


@@ -40,12 +28,14 @@ OSM.History = function (map) {
   };
 
   function highlightChangeset(id) {
   };
 
   function highlightChangeset(id) {

-    group.getLayer(id).setStyle({ fillOpacity: 0.3, color: "#FF6600", weight: 3 });
+    var layer = group.getLayer(id);
+    if (layer) layer.setStyle({ fillOpacity: 0.3, color: "#FF6600", weight: 3 });

     $("#changeset_" + id).addClass("selected");
   }
 
   function unHighlightChangeset(id) {
     $("#changeset_" + id).addClass("selected");
   }
 
   function unHighlightChangeset(id) {

-    group.getLayer(id).setStyle({ fillOpacity: 0, color: "#FF9500", weight: 2 });
+    var layer = group.getLayer(id);
+    if (layer) layer.setStyle({ fillOpacity: 0, color: "#FF9500", weight: 2 });

     $("#changeset_" + id).removeClass("selected");
   }
 
     $("#changeset_" + id).removeClass("selected");
   }
 


@@ -53,11 +43,26 @@ OSM.History = function (map) {
     $("#changeset_" + id).find("a.changeset_id").simulate("click", e);
   }
 
     $("#changeset_" + id).find("a.changeset_id").simulate("click", e);
   }
 

+  function displayFirstChangesets(html) {
+    $("#sidebar_content .changesets").html(html);
+  }
+
+  function displayMoreChangesets(html) {
+    $("#sidebar_content .changeset_more").replaceWith(html);
+    var oldList = $("#sidebar_content .changesets ol").first();
+    var newList = oldList.next("ol");
+    newList.children().appendTo(oldList);
+    newList.remove();
+  }
+

   function update() {
     var data = { list: "1" };
 
     if (window.location.pathname === "/history") {
       data.bbox = map.getBounds().wrap().toBBoxString();
   function update() {
     var data = { list: "1" };
 
     if (window.location.pathname === "/history") {
       data.bbox = map.getBounds().wrap().toBBoxString();

+      var feedLink = $("link[type=\"application/atom+xml\"]"),
+          feedHref = feedLink.attr("href").split("?")[0];
+      feedLink.attr("href", feedHref + "?bbox=" + data.bbox);

     }
 
     $.ajax({
     }
 
     $.ajax({


@@ -65,15 +70,10 @@ OSM.History = function (map) {
       method: "GET",
       data: data,
       success: function (html) {
       method: "GET",
       data: data,
       success: function (html) {

-        $("#sidebar_content .changesets").html(html);
+        displayFirstChangesets(html);

         updateMap();
       }
     });
         updateMap();
       }
     });

-
-    var feedLink = $("link[type=\"application/atom+xml\"]"),
-        feedHref = feedLink.attr("href").split("?")[0];
-
-    feedLink.attr("href", feedHref + "?bbox=" + data.bbox);

   }
 
   function loadMore(e) {
   }
 
   function loadMore(e) {


@@ -85,8 +85,8 @@ OSM.History = function (map) {
     $(this).hide();
     div.find(".loader").show();
 
     $(this).hide();
     div.find(".loader").show();
 

-    $.get($(this).attr("href"), function (data) {
-      div.replaceWith(data);
+    $.get($(this).attr("href"), function (html) {
+      displayMoreChangesets(html);

       updateMap();
     });
   }
       updateMap();
     });
   }


@@ -101,7 +101,7 @@ OSM.History = function (map) {
           topRight = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
           width = topRight.x - bottomLeft.x,
           height = bottomLeft.y - topRight.y,
           topRight = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
           width = topRight.x - bottomLeft.x,
           height = bottomLeft.y - topRight.y,

-          minSize = 20;  // Min width/height of changeset in pixels
+          minSize = 20; // Min width/height of changeset in pixels

 
       if (width < minSize) {
         bottomLeft.x -= ((minSize - width) / 2);
 
       if (width < minSize) {
         bottomLeft.x -= ((minSize - width) / 2);


@@ -146,7 +146,6 @@ OSM.History = function (map) {
   }
 
   page.pushstate = page.popstate = function (path) {
   }
 
   page.pushstate = page.popstate = function (path) {

-    $("#history_tab").addClass("current");

     OSM.loadSidebarContent(path, page.load);
   };
 
     OSM.loadSidebarContent(path, page.load);
   };
 


@@ -165,8 +164,6 @@ OSM.History = function (map) {
   page.unload = function () {
     map.removeLayer(group);
     map.off("moveend", update);
   page.unload = function () {
     map.removeLayer(group);
     map.off("moveend", update);

-
-    $("#history_tab").removeClass("current");

   };
 
   return page;
   };
 
   return page;