Skip to content

Commit

Permalink
DC fix back button to profile with this.deferred reference
Browse files Browse the repository at this point in the history
  • Loading branch information
danielgrippi committed May 17, 2012
1 parent ed6785d commit e5206f3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
5 changes: 4 additions & 1 deletion app/assets/javascripts/app/models/stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
});
30 changes: 16 additions & 14 deletions app/assets/javascripts/app/views/canvas_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit e5206f3

Please sign in to comment.