Merge branch 'sismo' of https://github.com/afimb/chouette2 into sismo

4 files changed, 4 insertions, 68 deletions

diff --git a/app/assets/javascripts/access_points.js.coffee b/app/assets/javascripts/access_points.js.coffee
index ee5e89def..56ae24d1e 100644
--- a/app/assets/javascripts/access_points.js.coffee
+++ b/app/assets/javascripts/access_points.js.coffee
@@ -29,17 +29,4 @@ jQuery ->
 
   $('input#access_point_projection_xy').change(lon_lat_change)  
   
-  # switch visibility of access_links
-  switch_generics = (event) -> 
-    event.preventDefault()
-    $('.access_points .generics.content').toggle('slow')
-    $('a.generics .switcher').toggle()
 
-  $('.access_points a.generics').click(switch_generics)
-
-  switch_details = (event) -> 
-    event.preventDefault()
-    $('.access_points .details.content').toggle('slow')
-    $('a.details .switcher').toggle()
-
-  $('.access_points a.details').click(switch_details)
diff --git a/app/assets/javascripts/journey_pattern.js.coffee b/app/assets/javascripts/journey_pattern.js.coffee
index 062fc611e..0f203397b 100644
--- a/app/assets/javascripts/journey_pattern.js.coffee
+++ b/app/assets/javascripts/journey_pattern.js.coffee
@@ -3,6 +3,7 @@ jQuery ->
     if (event.type == 'mouseenter') 
       if event.target.id.match(/^stop_point_(\w+)$/)
         stopAreaId = $("#"+event.target.id+" a").attr('href').match(/\d+$/)[0]
+        console.log(stopAreaId)
         placeMark = selectFeature.layer.getFeatureByFid( stopAreaId)
         selectFeature.unselectAll()
         selectFeature.select( placeMark)
@@ -11,9 +12,3 @@ jQuery ->
 
   $(document).on("hover", '.journey_patterns.show div.stop_points .stop_point', select_stop_on_map)
 
-  make_ajax_pagination = () ->
-    $.get(this.href, null, null, 'script')
-    false
-
-  $(document).on("click", '.stop_points_detail .pagination a', make_ajax_pagination)
-
diff --git a/app/assets/javascripts/route.js.coffee b/app/assets/javascripts/route.js.coffee
index b679f1893..ea2984d02 100644
--- a/app/assets/javascripts/route.js.coffee
+++ b/app/assets/javascripts/route.js.coffee
@@ -1,22 +1,10 @@
-jQuery ->
-  switch_journey_patterns = (event) -> 
-    event.preventDefault()
-    $('.routes.show .journey_patterns.content').toggle('slow')
-    $('a.journey_patterns .switcher').toggle()
-
-  $('.routes.show a.journey_patterns').click(switch_journey_patterns)
-
-  switch_stop_points = (event) -> 
-    event.preventDefault()
-    $('.routes.show .stop_points_detail').toggle('slow')
-    $('a.stop_points .switcher').toggle()
-
-  $('.routes.show a.stop_points').click(switch_stop_points)
-
+jQuery -> 
   select_stop_on_map = (event) ->
     if (event.type == 'mouseenter') 
       if event.target.id.match(/^stop_point_(\w+)$/)
+        console.log(event.target.id)
         stopAreaId = $("#"+event.target.id+" a").attr('href').match(/\d+$/)[0]
+        console.log(stopAreaId) 
         placeMark = selectFeature.layer.getFeatureByFid( stopAreaId)
         selectFeature.unselectAll()
         selectFeature.select( placeMark)
@@ -24,9 +12,3 @@ jQuery ->
       selectFeature.unselectAll()
 
   $(document).on("hover", '.routes.show div.stop_points .stop_point', select_stop_on_map)
-
-  make_ajax_pagination = () ->
-    $.get(this.href, null, null, 'script')
-    false
-
-  $(document).on("click", '.routes.show .stop_points_detail .pagination a', make_ajax_pagination)
diff --git a/app/assets/javascripts/time_tables.js.coffee b/app/assets/javascripts/time_tables.js.coffee
index 75889bd3f..ccc4fe0fe 100644
--- a/app/assets/javascripts/time_tables.js.coffee
+++ b/app/assets/javascripts/time_tables.js.coffee
@@ -1,32 +1,4 @@
 jQuery ->
-# add trigger to hide/show application dates and periods
-  switch_calendars = (event) -> 
-    event.preventDefault()
-    $('.time_tables .calendars.content').toggle('slow')
-    $('a.calendars .switcher').toggle()
-
-  $('.time_tables').on('click','a.calendars',switch_calendars)
-
-  switch_dates = (event) -> 
-    event.preventDefault()
-    $('.time_tables .dates.content').toggle('slow')
-    $('a.dates .switcher').toggle()
-
-  $('.time_tables').on('click','a.dates',switch_dates)
-
-  switch_excluded_dates = (event) -> 
-    event.preventDefault()
-    $('.time_tables .excluded_dates.content').toggle('slow')
-    $('a.excluded_dates .switcher').toggle()
-
-  $('.time_tables').on('click','a.excluded_dates',switch_excluded_dates)
-
-  switch_periods = (event) -> 
-    event.preventDefault()
-    $('.time_tables .periods.content').toggle('slow')
-    $('a.periods .switcher').toggle()
-
-  $('.time_tables').on('click','a.periods',switch_periods)
 
 # add trigger when creating new date or period entries to activate datepicker
   tt_datepickerI18n = (index, element) ->