Move leaflet.contextmenu 3rd party code to "vendor" folder

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

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index f7ac876369c2f21fb7288c602b28337e6293a4cc..a8615d3eb11339f3cc7c35a39a9f06d28f00fdb5 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -108,7 +108,7 @@ OSM.Directions = function (map) {
     return endpoint;
   }
 
-  $(".directions_form a.directions_close").on("click", function(e) {
+  $(".directions_form .close").on("click", function(e) {
     e.preventDefault();
     var route_from = endpoints[0].value;
     if (route_from) {
@@ -146,7 +146,7 @@ OSM.Directions = function (map) {
 
   function getRoute() {
     // Cancel any route that is already in progress
-    if (awaitingRoute) awaitingRoute.abourt();
+    if (awaitingRoute) awaitingRoute.abort();
 
     // go fetch geocodes for any endpoints which have not already
     // been geocoded.
@@ -303,7 +303,7 @@ OSM.Directions = function (map) {
 
   $(".routing_marker").on('dragstart', function (e) {
     e.originalEvent.dataTransfer.effectAllowed = 'move';
-    e.originalEvent.dataTransfer.setData('id', this.id);
+    e.originalEvent.dataTransfer.setData('type', $(this).data('type'));
     var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
     e.originalEvent.dataTransfer.setDragImage(img.get(0), 12, 21);
   });
@@ -321,11 +321,11 @@ OSM.Directions = function (map) {
     $("#map").on('drop', function (e) {
       e.preventDefault();
       var oe = e.originalEvent;
-      var id = oe.dataTransfer.getData('id');
+      var type = oe.dataTransfer.getData('type');
       var pt = L.DomEvent.getMousePosition(oe, map.getContainer());  // co-ordinates of the mouse pointer at present
       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);
-      endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll);
+      endpoints[type === 'from' ? 0 : 1].setLatLng(ll);
       getRoute();
     });