From 4a75065b62cf5cfa21374ded8b76e4538f61bb35 Mon Sep 17 00:00:00 2001 From: riking Date: Fri, 1 Aug 2014 13:23:53 -0700 Subject: [PATCH] FIX: Topic progress bar was not updating after expanding gaps --- .../javascripts/discourse/models/post_stream.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js index 5cd0da074df..e75f6df82b0 100644 --- a/app/assets/javascripts/discourse/models/post_stream.js +++ b/app/assets/javascripts/discourse/models/post_stream.js @@ -17,9 +17,7 @@ Discourse.PostStream = Em.Object.extend({ notLoading: Em.computed.not('loading'), - filteredPostsCount: function(){ - return this.get("stream").length; - }.property("stream.@each"), + filteredPostsCount: Em.computed.alias("stream.length"), /** Have we loaded any posts? @@ -281,7 +279,6 @@ Discourse.PostStream = Em.Object.extend({ if (idx !== -1) { // Insert the gap at the appropriate place stream.splice.apply(stream, [idx, 0].concat(gap)); - stream.enumerableContentDidChange(); var postIdx = currentPosts.indexOf(post); if (postIdx !== -1) { @@ -294,6 +291,7 @@ Discourse.PostStream = Em.Object.extend({ }); delete self.get('gaps.before')[postId]; + self.get('stream').enumerableContentDidChange(); }); } } @@ -311,11 +309,14 @@ Discourse.PostStream = Em.Object.extend({ fillGapAfter: function(post, gap) { var postId = post.get('id'), stream = this.get('stream'), - idx = stream.indexOf(postId); + idx = stream.indexOf(postId), + self = this; if (idx !== -1) { stream.pushObjects(gap); - return this.appendMore(); + return this.appendMore().then(function() { + self.get('stream').enumerableContentDidChange(); + }); } return Ember.RSVP.resolve(); },