From 3cc0458312a0d230050b09679da80497052769c8 Mon Sep 17 00:00:00 2001 From: Alex Denisov <1101.debian@gmail.com> Date: Wed, 9 Jan 2013 18:14:24 +0000 Subject: [PATCH] Reloading of events via ajax instead of page reloading. --- app/assets/javascripts/dashboard.js | 13 ++++++++++--- app/helpers/events_helper.rb | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 11eead977..575fa4716 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -10,13 +10,20 @@ $(function(){ function dashboardPage(){ $(".event_filter_link").bind('click',(function(){ - enableFilter(this.id); + toggleFilter($(this)); + reloadActivities(); })); } -function enableFilter(sender_id){ +function reloadActivities(){ + $('.content_list').html(''); + Pager.init(20, true); +} + +function toggleFilter(sender){ + sender.parent().toggleClass('inactive'); var event_filters = $.cookie('event_filter'); - var filter = sender_id.split('_')[0]; + var filter = sender.attr('id').split('_')[0]; if (!event_filters) { event_filters = new Array(); } else { diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 9b9d2a913..771a6364b 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -29,7 +29,7 @@ module EventsHelper end content_tag :div, class: "filter_icon #{inactive}" do - link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do + link_to 'javascript:void(0)', class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do image_tag "event_filter_#{key}.png" end end -- 2.11.0