From 91180ea89c78fd905341804ee40625bfcd9da2af Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Fri, 26 Sep 2014 12:00:48 +0200 Subject: Fix journey pattern index design and css paginate --- app/assets/javascripts/journey_pattern.js.coffee | 7 +------ app/assets/javascripts/route.js.coffee | 24 +++--------------------- 2 files changed, 4 insertions(+), 27 deletions(-) (limited to 'app/assets/javascripts') 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) -- cgit v1.2.3