From->To->Go order as per @samanpwbb's comment

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e5f6fe47811a4f275f4814a0a7267dc5cee9b3f6..52b8b4c2300c1386a93b518976ddbee10b8920a0 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -355,14 +355,17 @@ $(document).ready(function () {
     e.preventDefault();
     $(".search").hide();
     $(".routing").show();
+    $(".search_form input[type='submit']").addClass("routing_submit");
     $(".query_wrapper.routing [name=route_from]").focus();
     $("#map").on('dragend dragover',function(e) { e.preventDefault(); });
     $("#map").on('drop',function(e) { OSM.routing.handleDrop(e); e.preventDefault(); });
     $(".routing_marker").on('dragstart',function(e) {
       e.originalEvent.dataTransfer.effectAllowed = 'move';
       e.originalEvent.dataTransfer.setData('id', this.id);
-      e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width/2 - (e.originalEvent.x-e.target.x));
-      e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height  - (e.originalEvent.y-e.target.y));
+      var xo=e.originalEvent.clientX - $(e.target).offset().left;
+      var yo=e.originalEvent.clientY - $(e.target).offset().top;
+      e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width/2 - xo);
+      e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height  - yo);
     });
   });
 
@@ -370,6 +373,7 @@ $(document).ready(function () {
     e.preventDefault();
     $(".search").show();
     $(".routing").hide();
+    $(".search_form input[type='submit']").removeClass("routing_submit");
     OSM.routing.close();
     $("#map").off('dragend drop dragover');
     $(".routing_marker").off('dragstart');