nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added inf. scroll to stream; passing inf. scroll cukes

Browse source
This commit is contained in:
danielgrippi 2011-12-31 13:39:28 -05:00 committed by Dennis Collinson
parent 33e0de94f8
commit bc0c92ec64
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/step_definitions/custom_web_steps.rb
View file

@ -179,8 +179,6 @@ end
And /^I scroll down$/ do And /^I scroll down$/ do
evaluate_script("window.scrollBy(0,3000000)") evaluate_script("window.scrollBy(0,3000000)")
sleep 1
wait_until(30) { evaluate_script('$("#infscr-loading:visible").length') == 0 }
step "I wait for the ajax to finish" step "I wait for the ajax to finish"
end end

22
public/javascripts/app/views/stream_view.js
View file

@ -9,9 +9,26 @@ app.views.Stream = Backbone.View.extend({
this.publisher = new app.views.Publisher({collection : this.collection}); this.publisher = new app.views.Publisher({collection : this.collection});
// inf scroll
// we're using this._loading to keep track of backbone's collection
// fetching state... is there a better way to do this?
var throttledScroll = _.throttle($.proxy(this.infScroll, this), 200);
$(window).scroll(throttledScroll);
return this; return this;
}, },
infScroll : function(options) {
var $window = $(window);
var distFromTop = $window.height() + $window.scrollTop();
var distFromBottom = $(document).height() - distFromTop;
var bufferPx = 300;
if(distFromBottom < bufferPx && !this._loading) {
this.render();
}
},
prependPost : function(post) { prependPost : function(post) {
var postView = new app.views.Post({ model: post }); var postView = new app.views.Post({ model: post });
$(this.el).prepend(postView.render().el); $(this.el).prepend(postView.render().el);
@ -32,6 +49,8 @@ app.views.Stream = Backbone.View.extend({
href: this.collection.url(), href: this.collection.url(),
id: "paginate" id: "paginate"
}).text('Load more posts')); }).text('Load more posts'));
this._loading = false;
}, },
render : function(evt) { render : function(evt) {
@ -39,6 +58,9 @@ app.views.Stream = Backbone.View.extend({
var self = this; var self = this;
self.addLoader(); self.addLoader();
this._loading = true;
self.collection.fetch({ self.collection.fetch({
add: true, add: true,
success: $.proxy(this.collectionFetched, self) success: $.proxy(this.collectionFetched, self)