Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Topic progress bar was not updating after expanding gaps

This commit is contained in:
riking 2014-08-01 13:23:53 -07:00
parent 23b237fd14
commit 4a75065b62
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/models/post_stream.js
View File

@ -17,9 +17,7 @@ Discourse.PostStream = Em.Object.extend({
notLoading: Em.computed.not('loading'), notLoading: Em.computed.not('loading'),
filteredPostsCount: function(){ filteredPostsCount: Em.computed.alias("stream.length"),
return this.get("stream").length;
}.property("stream.@each"),
/** /**
Have we loaded any posts? Have we loaded any posts?
@ -281,7 +279,6 @@ Discourse.PostStream = Em.Object.extend({
if (idx !== -1) { if (idx !== -1) {
// Insert the gap at the appropriate place // Insert the gap at the appropriate place
stream.splice.apply(stream, [idx, 0].concat(gap)); stream.splice.apply(stream, [idx, 0].concat(gap));
stream.enumerableContentDidChange();
var postIdx = currentPosts.indexOf(post); var postIdx = currentPosts.indexOf(post);
if (postIdx !== -1) { if (postIdx !== -1) {
@ -294,6 +291,7 @@ Discourse.PostStream = Em.Object.extend({
}); });
delete self.get('gaps.before')[postId]; delete self.get('gaps.before')[postId];
self.get('stream').enumerableContentDidChange();
}); });
} }
} }
@ -311,11 +309,14 @@ Discourse.PostStream = Em.Object.extend({
fillGapAfter: function(post, gap) { fillGapAfter: function(post, gap) {
var postId = post.get('id'), var postId = post.get('id'),
stream = this.get('stream'), stream = this.get('stream'),
idx = stream.indexOf(postId); idx = stream.indexOf(postId),
self = this;
if (idx !== -1) { if (idx !== -1) {
stream.pushObjects(gap); stream.pushObjects(gap);
return this.appendMore(); return this.appendMore().then(function() {
self.get('stream').enumerableContentDidChange();
});
} }
return Ember.RSVP.resolve(); return Ember.RSVP.resolve();
}, },