codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-18 03:25:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Issues with summaries and our Array

Browse source
This commit is contained in:
Robin Ward 2015-12-04 16:36:16 -05:00
parent 63ba6c78af
commit 420e362bdb
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/discourse/models/post-stream.js.es6
View file

@ -49,6 +49,14 @@ const PostsWithPlaceholders = Ember.Object.extend(Ember.Array, {
return this.get('posts.length') + Object.keys(this._appendingIds || {}).length; return this.get('posts.length') + Object.keys(this._appendingIds || {}).length;
}, },
clear(cb) {
const l = this.get('posts.length');
this.arrayContentWillChange(0, l, 0);
cb();
this.arrayContentWillChange(0, l, 0);
this.propertyDidChange('length');
},
append(cb) { append(cb) {
const l = this.get('posts.length'); const l = this.get('posts.length');
this.arrayContentWillChange(l, 0, 1); this.arrayContentWillChange(l, 0, 1);
@ -345,6 +353,7 @@ export default RestModel.extend({
stream.splice.apply(stream, [idx, 0].concat(gap)); stream.splice.apply(stream, [idx, 0].concat(gap));
let postIdx = currentPosts.indexOf(post); let postIdx = currentPosts.indexOf(post);
const origIdx = postIdx;
if (postIdx !== -1) { if (postIdx !== -1) {
return this.findPostsByIds(gap).then(posts => { return this.findPostsByIds(gap).then(posts => {
posts.forEach(p => { posts.forEach(p => {
@ -356,6 +365,7 @@ export default RestModel.extend({
delete this.get('gaps.before')[postId]; delete this.get('gaps.before')[postId];
this.get('stream').enumerableContentDidChange(); this.get('stream').enumerableContentDidChange();
this.get('postsWithPlaceholders').arrayContentDidChange(origIdx, 0, posts.length);
post.set('hasGap', false); post.set('hasGap', false);
}); });
} }
@ -728,7 +738,9 @@ export default RestModel.extend({
updateFromJson(postStreamData) { updateFromJson(postStreamData) {
const posts = this.get('posts'); const posts = this.get('posts');
posts.clear(); const postsWithPlaceholders = this.get('postsWithPlaceholders');
postsWithPlaceholders.clear(() => posts.clear());
this.set('gaps', null); this.set('gaps', null);
if (postStreamData) { if (postStreamData) {
// Load posts if present // Load posts if present