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

Fix infinite scroll after changing aspects

Browse source
This commit is contained in:
Raphael Sofaer 2011-04-26 18:26:12 -07:00
parent 2517653d34
commit 948725b946
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
features/infinite_scroll.feature
View file

@ -13,6 +13,8 @@ Feature: infinite scroll
When I scroll down When I scroll down
And I wait for the ajax to finish And I wait for the ajax to finish
#FIXME
And I wait for the ajax to finish
Then I should see 30 posts Then I should see 30 posts
When I follow "generic" When I follow "generic"
@ -21,4 +23,5 @@ Feature: infinite scroll
When I scroll down When I scroll down
And I wait for the ajax to finish And I wait for the ajax to finish
And I wait for the ajax to finish
Then I should see 30 posts Then I should see 30 posts

3
lib/log_overrider.rb
View file

@ -9,7 +9,7 @@ class ActionView::LogSubscriber
hash.merge(:layout => event.payload[:layout]) if event.payload[:layout] hash.merge(:layout => event.payload[:layout]) if event.payload[:layout]
Rails.logger.info(hash) #Rails.logger.info(hash)
end end
alias :render_partial :render_template alias :render_partial :render_template
alias :render_collection :render_template alias :render_collection :render_template
@ -81,6 +81,7 @@ end
module ActiveRecord module ActiveRecord
class LogSubscriber class LogSubscriber
def sql(event) def sql(event)
return
self.class.runtime += event.duration self.class.runtime += event.duration
return unless logger.info? return unless logger.info?

7
public/javascripts/widgets/infinite-scroll.js
View file

@ -28,7 +28,12 @@
}; };
InfiniteScroll.prototype.start = function() { InfiniteScroll.prototype.start = function() {
Diaspora.widgets.subscribe("stream/reloaded", this.initialize); var __bind = function(fn, me){
return function(){
return fn.apply(me, arguments);
};
};
Diaspora.widgets.subscribe("stream/reloaded", __bind(this.initialize, this));
this.initialize(); this.initialize();
}; };