diff options
| author | Michel Etienne | 2014-08-27 15:44:05 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-08-27 15:44:05 +0200 |
| commit | 4ff26e0096f122dc74b45b427137eb631da3fd06 (patch) | |
| tree | 8a9717bca9f5d05ff529462d6c8d7758e363eeb2 /app/assets/javascripts | |
| parent | 2a1b23c9bd1d4e2e97814ea9190892f2981b365d (diff) | |
| parent | 82cf451ad0faa76a26adc27528f4458596157802 (diff) | |
| download | chouette-core-4ff26e0096f122dc74b45b427137eb631da3fd06.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/vehicle_journey.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vehicle_journeys/show.js.coffee | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f8f6c6d1f..5b03dce78 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,3 +18,4 @@ //= require_directory ./plugins //= require_directory . //= require_directory ./stop_areas +//= require_directory ./vehicle_journeys diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee index 02c0c9f3b..39f511468 100644 --- a/app/assets/javascripts/vehicle_journey.js.coffee +++ b/app/assets/javascripts/vehicle_journey.js.coffee @@ -54,7 +54,7 @@ jQuery -> event.preventDefault() 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() + departure_or_arrival = $(".departure_or_arrival option:selected").val() selector_prefix = ".vehicle_journey_at_stops .journey_pattern_dependent_list" if (departure_or_arrival == "departure") diff --git a/app/assets/javascripts/vehicle_journeys/show.js.coffee b/app/assets/javascripts/vehicle_journeys/show.js.coffee new file mode 100644 index 000000000..103937d7b --- /dev/null +++ b/app/assets/javascripts/vehicle_journeys/show.js.coffee @@ -0,0 +1,8 @@ +$(".vehicle_journeys.show").ready -> + clean_content = (event) -> + $(event.target).find('#translate_form').contents().remove() + + $('#modal_translation').on( 'hide.bs.modal', clean_content ) + + + |