Download as
Browse Code »

Commit 3cc0458312a0d230050b09679da80497052769c8

Authored by Alex Denisov
1 parent 0d9f73fa
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Reloading of events via ajax instead of page reloading.

Showing 2 changed files with 11 additions and 4 deletions   Show diff stats
app/assets/javascripts/dashboard.js
  Diff comments   View file @3cc0458
@@ -10,13 +10,20 @@ $(function(){ @@ -10,13 +10,20 @@ $(function(){
10 10
11 function dashboardPage(){ 11 function dashboardPage(){
12 $(".event_filter_link").bind('click',(function(){ 12 $(".event_filter_link").bind('click',(function(){
13 - enableFilter(this.id); 13 + toggleFilter($(this));
  14 + reloadActivities();
14 })); 15 }));
15 } 16 }
16 17
17 -function enableFilter(sender_id){ 18 +function reloadActivities(){
  19 + $('.content_list').html('');
  20 + Pager.init(20, true);
  21 +}
  22 +
  23 +function toggleFilter(sender){
  24 + sender.parent().toggleClass('inactive');
18 var event_filters = $.cookie('event_filter'); 25 var event_filters = $.cookie('event_filter');
19 - var filter = sender_id.split('_')[0]; 26 + var filter = sender.attr('id').split('_')[0];
20 if (!event_filters) { 27 if (!event_filters) {
21 event_filters = new Array(); 28 event_filters = new Array();
22 } else { 29 } else {
app/helpers/events_helper.rb
  Diff comments   View file @3cc0458
@@ -29,7 +29,7 @@ module EventsHelper @@ -29,7 +29,7 @@ module EventsHelper
29 end 29 end
30 30
31 content_tag :div, class: "filter_icon #{inactive}" do 31 content_tag :div, class: "filter_icon #{inactive}" do
32 - link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do 32 + link_to 'javascript:void(0)', class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do
33 image_tag "event_filter_#{key}.png" 33 image_tag "event_filter_#{key}.png"
34 end 34 end
35 end 35 end