aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorMichel Etienne2014-08-22 17:10:17 +0200
committerMichel Etienne2014-08-22 17:10:17 +0200
commitf874505070d0fb5408b1ead8b7914d5dc5eeccf9 (patch)
tree3afcfe745e3d01662573927932de4644df98771c /app/assets/javascripts
parent2f082acdb5d708aa3acf6c71800727acfd1eaaf4 (diff)
parent68bc9de2849a88d2f185ff710285a70f5e596463 (diff)
downloadchouette-core-f874505070d0fb5408b1ead8b7914d5dc5eeccf9.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/vehicle_journey.js.coffee7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index b2f8b9ec7..02c0c9f3b 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -52,11 +52,12 @@ jQuery ->
slide = (event) ->
event.preventDefault()
- hour = parseInt( $(".vehicle_journeys .date select#date_hour").val())
- minute = parseInt( $(".vehicle_journeys .date select#date_minute").val())
+ hour = parseInt( $(".vehicle_journey_at_stops select#date_hour").val())
+ minute = parseInt( $(".vehicle_journey_at_stops select#date_minute").val())
+ departure_or_arrival = $(".departure_or_arrival").val()
selector_prefix = ".vehicle_journey_at_stops .journey_pattern_dependent_list"
- if $(this).hasClass("departure")
+ if (departure_or_arrival == "departure")
vjas_hour_selector = selector_prefix + " .departure_time select.hour"
vjas_minute_selector = selector_prefix + " .departure_time select.minute"
else