Revert "DC fix back button to profile with this.deferred reference"
This reverts commit e5206f3429.
This commit is contained in:
parent
e5206f3429
commit
e48d57b19b
2 changed files with 15 additions and 20 deletions
|
|
@ -59,14 +59,11 @@ app.models.Stream = Backbone.Collection.extend({
|
|||
},
|
||||
|
||||
preloadOrFetch : function(){ //hai, plz test me THNX
|
||||
app.hasPreload("stream") ? this.preload() : this.fetch()
|
||||
return this.deferred
|
||||
return $.when(app.hasPreload("stream") ? this.preload() : this.fetch())
|
||||
},
|
||||
|
||||
preload : function(){
|
||||
this.items.reset(app.parsePreload("stream"))
|
||||
this.trigger("fetched")
|
||||
|
||||
this.deferred = $.when(true)
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ app.views.Canvas = app.views.Base.extend(_.extend({}, app.views.infiniteScrollMi
|
|||
},
|
||||
|
||||
renderTemplate : function() {
|
||||
this.stream.deferred.done(_.bind(function(){
|
||||
if(this.stream.items.isEmpty()){
|
||||
var message
|
||||
, person = app.page.model
|
||||
|
|
@ -27,7 +26,6 @@ app.views.Canvas = app.views.Base.extend(_.extend({}, app.views.infiniteScrollMi
|
|||
|
||||
//needs to be deferred so it happens after html rendering finishes
|
||||
_.defer(_.bind(this.mason, this))
|
||||
}, this))
|
||||
},
|
||||
|
||||
addPostView : function(post) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue