From d7529f24c340cbe4ec4acd64435faac02b29a3c7 Mon Sep 17 00:00:00 2001
From: Marc Florisson
Date: Fri, 22 Aug 2014 18:18:35 +0200
Subject: fix time slide after change on html. Mantis 26840

---
 app/assets/javascripts/vehicle_journey.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

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")
-- 
cgit v1.2.3


From 110f448e05161faecba04d4c2a20818102a1835b Mon Sep 17 00:00:00 2001
From: Marc Florisson
Date: Tue, 26 Aug 2014 10:54:06 +0200
Subject: clean modal form when closing. Mantis 26839

---
 app/assets/javascripts/vehicle_journeys/show.js.coffee | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 app/assets/javascripts/vehicle_journeys/show.js.coffee

(limited to 'app/assets/javascripts')

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 )
+
+
+
-- 
cgit v1.2.3


From 286912a0e775a0fbc85943460046f47ef022ec35 Mon Sep 17 00:00:00 2001
From: Marc Florisson
Date: Tue, 26 Aug 2014 10:55:23 +0200
Subject: update application.js for vehicle_journey show. Mantis 26839

---
 app/assets/javascripts/application.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 682945294..b20582b76 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
-- 
cgit v1.2.3