Speedup dashboard via loading events with ajax

Dmitriy Zaporozhets
1 parent 6c777ff8
Showing 4 changed files with 14 additions and 4 deletions Show diff stats
app/assets/javascripts/pager.js
app/views/dashboard/_activities.html.haml
app/views/dashboard/index.html.haml
features/dashboard/dashboard.feature
@@ -4,9 +4,16 @@ var Pager = {
   disable:false,
   init:
-    function(limit) {
+    function(limit, preload) {
       this.limit=limit;
-      this.offset=limit;
+
+      if(preload) { 
+        this.offset = 0;
+        this.getOld();
+      } else { 
+        this.offset = limit;
+      }
+
       this.initLoadMore();
     },
@@ -7,7 +7,7 @@
   = event_filter_link EventFilter.team, 'Team'
 - if @events.any?
-  .content_list= render @events
+  .content_list
 - else
   %p.nothing_here_message Projects activity will be displayed here
 .loading.hide
@@ -8,4 +8,4 @@
 - else
   = render "zero_authorized_projects"
 :javascript
-  $(function(){ Pager.init(20); });
+  $(function(){ Pager.init(20, true); });
@@ -5,6 +5,7 @@ Feature: Dashboard
     And project "Shop" has push event
     And I visit dashboard page
+  @javascript
   Scenario: I should see projects list
     Then I should see "New Project" link
     Then I should see "Shop" project link
@@ -26,11 +27,13 @@ Feature: Dashboard
     And I click "Create Merge Request" link
     Then I see prefilled new Merge Request page
+  @javascript
   Scenario: I should see User joined Project event
     Given user with name "John Doe" joined project "Shop"
     When I visit dashboard page
     Then I should see "John Doe joined project at Shop" event
+  @javascript
   Scenario: I should see User left Project event
     Given user with name "John Doe" joined project "Shop"
     And user with name "John Doe" left project "Shop"
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	= event_filter_link EventFilter.team, 'Team'	7	= event_filter_link EventFilter.team, 'Team'
8		8
9	- if @events.any?	9	- if @events.any?
10	- .content_list= render @events	10	+ .content_list
11	- else	11	- else
12	%p.nothing_here_message Projects activity will be displayed here	12	%p.nothing_here_message Projects activity will be displayed here
13	.loading.hide	13	.loading.hide
	@@ -8,4 +8,4 @@		@@ -8,4 +8,4 @@
8	- else	8	- else
9	= render "zero_authorized_projects"	9	= render "zero_authorized_projects"
10	:javascript	10	:javascript
11	- $(function(){ Pager.init(20); });	11	+ $(function(){ Pager.init(20, true); });