X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ae4e53f4582f91267ec829a5b6cb1b2260aa06b..84aa7f455ae58b4b051368e35dbc43f780b3aa0f:/app/assets/javascripts/index/directions.js diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index f6b0581ca..9c5ff2a8d 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -3,7 +3,6 @@ //= require qs/dist/qs OSM.Directions = function (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 chosenEngine; @@ -70,12 +69,10 @@ OSM.Directions = function (map) { }); input.on("keydown", function () { - input.removeClass("error"); + input.removeClass("is-invalid"); }); input.on("change", function (e) { - awaitingGeocode = true; - // make text the same in both text boxes var value = e.target.value; endpoint.setValue(value); @@ -84,7 +81,7 @@ OSM.Directions = function (map) { endpoint.setValue = function (value, latlng) { endpoint.value = value; delete endpoint.latlng; - input.removeClass("error"); + input.removeClass("is-invalid"); input.val(value); if (latlng) { @@ -109,7 +106,7 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length === 0) { - input.addClass("error"); + input.addClass("is-invalid"); alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); return; } @@ -118,10 +115,7 @@ OSM.Directions = function (map) { input.val(json[0].display_name); - if (awaitingGeocode) { - awaitingGeocode = false; - getRoute(true, true); - } + getRoute(true, true); }); }; @@ -209,11 +203,9 @@ OSM.Directions = function (map) { var endpoint = endpoints[ep_i]; if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) { endpoint.getGeocode(); - awaitingGeocode = true; } } if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) { - awaitingGeocode = true; return; }