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

refactor stream fetching logic

Browse source
This commit is contained in:
danielgrippi 2012-04-17 19:18:02 -07:00
parent 16223d003f
commit 37cd6f616e
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/assets/javascripts/app/models/stream.js
View file

@ -15,34 +15,21 @@ app.models.Stream = Backbone.Collection.extend({
return _.any(this.posts.models) ? this.timeFilteredPath() : this.basePath() return _.any(this.posts.models) ? this.timeFilteredPath() : this.basePath()
}, },
_fetching : false,
fetch: function() { fetch: function() {
if(this._fetching) { return false; } if(this.deferred && !this.deferred.isResolved()){ return false }
var self = this var url = this.url()
this.deferred = this.posts.fetch({
// we're fetching the collection... there is probably a better way to do this
self._fetching = true;
this.posts
.fetch({
add : true, add : true,
url : self.url() url : url
}) }).done(_.bind(this.triggerFetchedEvents, this))
.done( },
function(resp){
// we're done fetching... there is probably a better way to handle this
self._fetching = false;
self.trigger("fetched", self); triggerFetchedEvents : function(resp){
this.trigger("fetched", this);
// all loaded? // all loaded?
if(resp.posts && (resp.posts.author || resp.posts.length == 0)) { if(resp.posts && (resp.posts.author || resp.posts.length == 0)) {
self.trigger("allPostsLoaded", self); this.trigger("allPostsLoaded", this);
} }
}
)
return this;
}, },
basePath : function(){ basePath : function(){

2
spec/javascripts/app/views/stream_view_spec.js
View file

@ -9,8 +9,6 @@ describe("app.views.Stream", function() {
this.view = new app.views.Stream({model : this.stream}); this.view = new app.views.Stream({model : this.stream});
app.stream.bind("fetched", this.collectionFetched, this); //untested
// do this manually because we've moved loadMore into render?? // do this manually because we've moved loadMore into render??
this.view.render(); this.view.render();
_.each(this.view.collection.models, function(post) { _.each(this.view.collection.models, function(post) {