Drop rjs from Infinite scrolling

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 70c2e1d7
Showing 12 changed files with 30 additions and 21 deletions Show diff stats
app/assets/javascripts/commits.js.coffee
app/assets/javascripts/pager.js.coffee
app/controllers/application_controller.rb
app/controllers/dashboard_controller.rb
app/controllers/groups_controller.rb
app/controllers/projects/commits_controller.rb
app/controllers/projects_controller.rb
app/views/dashboard/show.js.haml
app/views/events/_events.html.haml
app/views/groups/show.js.haml
app/views/projects/commits/show.js.haml
app/views/projects/show.js.haml
@@ -4,13 +4,13 @@ class CommitsList
     limit: 0
     offset: 0
   @disable = false
-  
+
   @showProgress: ->
     $('.loading').show()
-    
+
   @hideProgress: ->
     $('.loading').hide()
-  
+
   @init: (ref, limit) ->
     $(".day-commits-table li.commit").live 'click', (event) ->
       if event.target.nodeName != "A"
@@ -21,7 +21,7 @@ class CommitsList
     @data.ref = ref
     @data.limit = limit
     @data.offset = limit
-    
+
     this.initLoadMore()
     this.showProgress()
  
@@ -32,7 +32,9 @@ class CommitsList
       url: location.href
       data: @data
       complete: this.hideProgress
-      dataType: "script"
+      success: (data) ->
+        CommitsList.append(data.count, data.html)
+      dataType: "json"
  
   @append: (count, html) ->
     $("#commits-list").append(html)
@@ -40,7 +42,7 @@ class CommitsList
       @data.offset += count
     else
       @disable = true
-  
+
   @initLoadMore: ->
     $(document).unbind('scroll')
     $(document).endlessScroll
@@ -19,8 +19,9 @@
       data: "limit=" + @limit + "&offset=" + @offset
       complete: ->
         $(".loading").hide()
-
-      dataType: "script"
+      success: (data) ->
+        Pager.append(data.count, data.html)
+      dataType: "json"
  
   append: (count, html) ->
     $(".content_list").append html
@@ -174,4 +174,18 @@ class ApplicationController &lt; ActionController::Base
     filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
     @event_filter ||= EventFilter.new(filters)
   end
+
+  # JSON for infinite scroll via Pager object
+  def pager_json(partial, count)
+    html = render_to_string(
+      partial,
+      layout: false,
+      formats: [:html]
+    )
+
+    render json: {
+      html: html,
+      count: count
+    }
+  end
 end
@@ -22,7 +22,7 @@ class DashboardController &lt; ApplicationController
  
     respond_to do |format|
       format.html
-      format.js
+      format.json { pager_json("events/_events", @events.count) }
       format.atom { render layout: false }
     end
   end
@@ -38,7 +38,7 @@ class GroupsController &lt; ApplicationController
  
     respond_to do |format|
       format.html
-      format.js
+      format.json { pager_json("events/_events", @events.count) }
       format.atom { render layout: false }
     end
   end
@@ -16,7 +16,7 @@ class Projects::CommitsController &lt; Projects::ApplicationController
  
     respond_to do |format|
       format.html # index.html.erb
-      format.js
+      format.json { pager_json("projects/commits/_commits", @commits.size) }
       format.atom { render layout: false }
     end
   end
@@ -73,7 +73,7 @@ class ProjectsController &lt; ApplicationController
           render :show, layout: user_layout
         end
       end
-      format.js
+      format.json { pager_json("events/_events", @events.count) }
     end
   end
  
@@ -1,2 +0,0 @@
-:plain 
-  Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
@@ -0,0 +1 @@
+= render @events
@@ -1,2 +0,0 @@
-:plain 
-  Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
@@ -1,3 +0,0 @@
-:plain
-  CommitsList.append(#{@commits.count}, "#{escape_javascript(render('projects/commits/commits'))}");
-
@@ -1,2 +0,0 @@
-:plain
-  Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
...	...	@@ -4,13 +4,13 @@ class CommitsList
4	4	limit: 0
5	5	offset: 0
6	6	@disable = false
7		-
	7	+
8	8	@showProgress: ->
9	9	$('.loading').show()
10		-
	10	+
11	11	@hideProgress: ->
12	12	$('.loading').hide()
13		-
	13	+
14	14	@init: (ref, limit) ->
15	15	$(".day-commits-table li.commit").live 'click', (event) ->
16	16	if event.target.nodeName != "A"
...	...	@@ -21,7 +21,7 @@ class CommitsList
21	21	@data.ref = ref
22	22	@data.limit = limit
23	23	@data.offset = limit
24		-
	24	+
25	25	this.initLoadMore()
26	26	this.showProgress()
27	27
...	...	@@ -32,7 +32,9 @@ class CommitsList
32	32	url: location.href
33	33	data: @data
34	34	complete: this.hideProgress
35		- dataType: "script"
	35	+ success: (data) ->
	36	+ CommitsList.append(data.count, data.html)
	37	+ dataType: "json"
36	38
37	39	@append: (count, html) ->
38	40	$("#commits-list").append(html)
...	...	@@ -40,7 +42,7 @@ class CommitsList
40	42	@data.offset += count
41	43	else
42	44	@disable = true
43		-
	45	+
44	46	@initLoadMore: ->
45	47	$(document).unbind('scroll')
46	48	$(document).endlessScroll
...	...
...	...	@@ -19,8 +19,9 @@
19	19	data: "limit=" + @limit + "&offset=" + @offset
20	20	complete: ->
21	21	$(".loading").hide()
22		-
23		- dataType: "script"
	22	+ success: (data) ->
	23	+ Pager.append(data.count, data.html)
	24	+ dataType: "json"
24	25
25	26	append: (count, html) ->
26	27	$(".content_list").append html
...	...
...	...	@@ -174,4 +174,18 @@ class ApplicationController < ActionController::Base
174	174	filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
175	175	@event_filter \|\|= EventFilter.new(filters)
176	176	end
	177	+
	178	+ # JSON for infinite scroll via Pager object
	179	+ def pager_json(partial, count)
	180	+ html = render_to_string(
	181	+ partial,
	182	+ layout: false,
	183	+ formats: [:html]
	184	+ )
	185	+
	186	+ render json: {
	187	+ html: html,
	188	+ count: count
	189	+ }
	190	+ end
177	191	end
...	...
...	...	@@ -22,7 +22,7 @@ class DashboardController < ApplicationController
22	22
23	23	respond_to do \|format\|
24	24	format.html
25		- format.js
	25	+ format.json { pager_json("events/_events", @events.count) }
26	26	format.atom { render layout: false }
27	27	end
28	28	end
...	...
...	...	@@ -38,7 +38,7 @@ class GroupsController < ApplicationController
38	38
39	39	respond_to do \|format\|
40	40	format.html
41		- format.js
	41	+ format.json { pager_json("events/_events", @events.count) }
42	42	format.atom { render layout: false }
43	43	end
44	44	end
...	...
...	...	@@ -16,7 +16,7 @@ class Projects::CommitsController < Projects::ApplicationController
16	16
17	17	respond_to do \|format\|
18	18	format.html # index.html.erb
19		- format.js
	19	+ format.json { pager_json("projects/commits/_commits", @commits.size) }
20	20	format.atom { render layout: false }
21	21	end
22	22	end
...	...
...	...	@@ -73,7 +73,7 @@ class ProjectsController < ApplicationController
73	73	render :show, layout: user_layout
74	74	end
75	75	end
76		- format.js
	76	+ format.json { pager_json("events/_events", @events.count) }
77	77	end
78	78	end
79	79
...	...
...	...	@@ -1,2 +0,0 @@
1		-:plain
2		- Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
...	...	@@ -1,3 +0,0 @@
1		-:plain
2		- CommitsList.append(#{@commits.count}, "#{escape_javascript(render('projects/commits/commits'))}");
3		-