X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5bd59e19368d8761a7dbaa5db0e8833174c11f36..5da7215873152fd52a93c3d91bc38c5dbb32ddce:/app/assets/javascripts/index/history.js?ds=sidebyside diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index a0c68e840..c20d342c5 100644 --- 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 = {}; @@ -10,18 +10,6 @@ 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() @@ -40,12 +28,14 @@ OSM.History = function (map) { }; 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) { - 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"); } @@ -71,7 +61,7 @@ OSM.History = function (map) { }); var feedLink = $("link[type=\"application/atom+xml\"]"), - feedHref = feedLink.attr("href").split("?")[0]; + feedHref = feedLink.attr("href").split("?")[0]; feedLink.attr("href", feedHref + "?bbox=" + data.bbox); } @@ -101,7 +91,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, - 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); @@ -123,8 +113,8 @@ OSM.History = function (map) { for (var i = 0; i < changesets.length; ++i) { var changeset = changesets[i], - rect = L.rectangle(changeset.bounds, - { weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFAF", fillOpacity: 0 }); + rect = L.rectangle(changeset.bounds, + { weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFAF", fillOpacity: 0 }); rect.id = changeset.id; rect.addTo(group); }