From: John Firebaugh Date: Mon, 12 May 2014 19:47:36 +0000 (-0700) Subject: Use unobtrusive JS for routing related events X-Git-Tag: live~4233^2~15^2~3 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/18c7c4f5d7995a56bf76bf81b86ff607bd27ef21 Use unobtrusive JS for routing related events --- diff --git a/app/assets/javascripts/index/directions.js.erb b/app/assets/javascripts/index/directions.js.erb index fb16c7915..254bfa2b8 100644 --- a/app/assets/javascripts/index/directions.js.erb +++ b/app/assets/javascripts/index/directions.js.erb @@ -352,5 +352,17 @@ OSM.Directions = function (map, name, jqSearch) { } }; + $("input[name='route_from']").on("change", function (e) { + r.geocode('route_from', e); + }); + + $("input[name='route_to']").on("change", function (e) { + r.geocode('route_to', e); + }); + + $("select[name='routing_engines']").on("change", function (e) { + r.selectEngine(e); + }); + return r; }; diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index 8d216ee80..43613352e 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -18,10 +18,10 @@
<%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %> - <%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from'), :onchange=>"OSM.directions.geocode('route_from',event)" %> + <%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %> <%= image_tag "marker-red.png" , :class => 'routing_marker', :id => 'marker_to' , :draggable => 'true' %> - <%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') , :onchange=>"OSM.directions.geocode('route_to' ,event)" %> - + <%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %> + <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>