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))}");
	@@ -174,4 +174,18 @@ class ApplicationController < ActionController::Base		@@ -174,4 +174,18 @@ class ApplicationController < ActionController::Base
174	filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?	174	filters = cookies['event_filter'].split(',') if cookies['event_filter'].present?
175	@event_filter \|\|= EventFilter.new(filters)	175	@event_filter \|\|= EventFilter.new(filters)
176	end	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	end	191	end
	@@ -22,7 +22,7 @@ class DashboardController < ApplicationController		@@ -22,7 +22,7 @@ class DashboardController < ApplicationController
22		22
23	respond_to do \|format\|	23	respond_to do \|format\|
24	format.html	24	format.html
25	- format.js	25	+ format.json { pager_json("events/_events", @events.count) }
26	format.atom { render layout: false }	26	format.atom { render layout: false }
27	end	27	end
28	end	28	end
	@@ -38,7 +38,7 @@ class GroupsController < ApplicationController		@@ -38,7 +38,7 @@ class GroupsController < ApplicationController
38		38
39	respond_to do \|format\|	39	respond_to do \|format\|
40	format.html	40	format.html
41	- format.js	41	+ format.json { pager_json("events/_events", @events.count) }
42	format.atom { render layout: false }	42	format.atom { render layout: false }
43	end	43	end
44	end	44	end
	@@ -16,7 +16,7 @@ class Projects::CommitsController < Projects::ApplicationController		@@ -16,7 +16,7 @@ class Projects::CommitsController < Projects::ApplicationController
16		16
17	respond_to do \|format\|	17	respond_to do \|format\|
18	format.html # index.html.erb	18	format.html # index.html.erb
19	- format.js	19	+ format.json { pager_json("projects/commits/_commits", @commits.size) }
20	format.atom { render layout: false }	20	format.atom { render layout: false }
21	end	21	end
22	end	22	end
	@@ -73,7 +73,7 @@ class ProjectsController < ApplicationController		@@ -73,7 +73,7 @@ class ProjectsController < ApplicationController
73	render :show, layout: user_layout	73	render :show, layout: user_layout
74	end	74	end
75	end	75	end
76	- format.js	76	+ format.json { pager_json("events/_events", @events.count) }
77	end	77	end
78	end	78	end
79		79
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-:plain
2	- Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-:plain
2	- CommitsList.append(#{@commits.count}, "#{escape_javascript(render('projects/commits/commits'))}");
3	-