DC fix back button to profile with this.deferred reference
This commit is contained in:
parent
ed6785d7cb
commit
e5206f3429
2 changed files with 20 additions and 15 deletions
|
|
@ -59,11 +59,14 @@ app.models.Stream = Backbone.Collection.extend({
|
|||
},
|
||||
|
||||
preloadOrFetch : function(){ //hai, plz test me THNX
|
||||
return $.when(app.hasPreload("stream") ? this.preload() : this.fetch())
|
||||
app.hasPreload("stream") ? this.preload() : this.fetch()
|
||||
return this.deferred
|
||||
},
|
||||
|
||||
preload : function(){
|
||||
this.items.reset(app.parsePreload("stream"))
|
||||
this.trigger("fetched")
|
||||
|
||||
this.deferred = $.when(true)
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,23 +9,25 @@ app.views.Canvas = app.views.Base.extend(_.extend({}, app.views.infiniteScrollMi
|
|||
},
|
||||
|
||||
renderTemplate : function() {
|
||||
if(this.stream.items.isEmpty()){
|
||||
var message
|
||||
, person = app.page.model
|
||||
if(person.get("is_own_profile")){
|
||||
message = "Make something to start the magic."
|
||||
this.stream.deferred.done(_.bind(function(){
|
||||
if(this.stream.items.isEmpty()){
|
||||
var message
|
||||
, person = app.page.model
|
||||
if(person.get("is_own_profile")){
|
||||
message = "Make something to start the magic."
|
||||
} else {
|
||||
var name = person.get("name") || ""
|
||||
message = name + " hasn't posted anything yet."
|
||||
}
|
||||
|
||||
this.$el.html("<p class='no-post-message'>" + message + "</p>")
|
||||
} else {
|
||||
var name = person.get("name") || ""
|
||||
message = name + " hasn't posted anything yet."
|
||||
this.renderInitialPosts()
|
||||
}
|
||||
|
||||
this.$el.html("<p class='no-post-message'>" + message + "</p>")
|
||||
} else {
|
||||
this.renderInitialPosts()
|
||||
}
|
||||
|
||||
//needs to be deferred so it happens after html rendering finishes
|
||||
_.defer(_.bind(this.mason, this))
|
||||
//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