Speedup dashboard via loading events with ajax

This commit is contained in:
Dmitriy Zaporozhets 2013-01-07 14:36:01 +02:00
parent 6c777ff823
commit 8d8c161a7f
4 changed files with 14 additions and 4 deletions

View File

@ -4,9 +4,16 @@ var Pager = {
disable:false, disable:false,
init: init:
function(limit) { function(limit, preload) {
this.limit=limit; this.limit=limit;
this.offset=limit;
if(preload) {
this.offset = 0;
this.getOld();
} else {
this.offset = limit;
}
this.initLoadMore(); this.initLoadMore();
}, },

View File

@ -7,7 +7,7 @@
= event_filter_link EventFilter.team, 'Team' = event_filter_link EventFilter.team, 'Team'
- if @events.any? - if @events.any?
.content_list= render @events .content_list
- else - else
%p.nothing_here_message Projects activity will be displayed here %p.nothing_here_message Projects activity will be displayed here
.loading.hide .loading.hide

View File

@ -8,4 +8,4 @@
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
:javascript :javascript
$(function(){ Pager.init(20); }); $(function(){ Pager.init(20, true); });

View File

@ -5,6 +5,7 @@ Feature: Dashboard
And project "Shop" has push event And project "Shop" has push event
And I visit dashboard page And I visit dashboard page
@javascript
Scenario: I should see projects list Scenario: I should see projects list
Then I should see "New Project" link Then I should see "New Project" link
Then I should see "Shop" project link Then I should see "Shop" project link
@ -26,11 +27,13 @@ Feature: Dashboard
And I click "Create Merge Request" link And I click "Create Merge Request" link
Then I see prefilled new Merge Request page Then I see prefilled new Merge Request page
@javascript
Scenario: I should see User joined Project event Scenario: I should see User joined Project event
Given user with name "John Doe" joined project "Shop" Given user with name "John Doe" joined project "Shop"
When I visit dashboard page When I visit dashboard page
Then I should see "John Doe joined project at Shop" event Then I should see "John Doe joined project at Shop" event
@javascript
Scenario: I should see User left Project event Scenario: I should see User left Project event
Given user with name "John Doe" joined project "Shop" Given user with name "John Doe" joined project "Shop"
And user with name "John Doe" left project "Shop" And user with name "John Doe" left project "Shop"