cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make close button on route dialogue return to index.

Browse source
This commit is contained in:
Matt Amos 2015-01-26 15:02:55 +00:00
parent 9995d316b2
commit 321218f9b1
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/index.js
View file

@ -236,6 +236,10 @@ $(document).ready(function () {
};
page.load = function() {
var params = querystring.parse(location.search.substring(1));
if (params.query) {
$("#sidebar .search_form input[name=query]").value(params.query);
}
if (!("autofocus" in document.createElement("input"))) {
$("#sidebar .search_form input[name=query]").focus();
}

10
app/assets/javascripts/index/directions.js.erb
View file

@ -2,6 +2,16 @@
//= require_tree ./directions_engines
OSM.Directions = function (map) {
$(".directions_form a.directions_close").on("click", function(e) {
e.preventDefault();
var route_from = $(e.target).parent().parent().parent().find("input[name=route_from]").val();
if (route_from) {
OSM.router.route("/?query=" + encodeURIComponent(route_from) + OSM.formatHash(map));
} else {
OSM.router.route("/" + OSM.formatHash(map));
}
});
var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
var dragging; // true if the user is dragging a start/end point

2
app/views/layouts/_search.html.erb
View file

@ -9,7 +9,7 @@
</form>
<form method="GET" action="<%= directions_path %>" class="directions_form">
<div width="100%" align="right" style="height:30px"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title') } %></div>
<div width="100%" align="right" style="height:30px"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title'), :class => "directions_close" } %></div>
<div class="line">
<%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>