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

[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 ddb454c13155e770bc4110e8b028d3a054fe13dd..d137b84565f1ad74755b8ed269c8d737d5c71dd3 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()


@@ -60,6 +48,9 @@ OSM.History = function (map) {
 
     if (window.location.pathname === "/history") {
       data.bbox = map.getBounds().wrap().toBBoxString();
 
     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({


@@ -71,11 +62,6 @@ OSM.History = function (map) {
         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) {