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

buggy is reply directly below

This commit is contained in:
Sam 2013-07-03 16:48:55 +10:00
parent 4d4a5735d2
commit d3cfb56000
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/models/post.js
View File

@ -267,7 +267,7 @@ Discourse.Post = Discourse.Model.extend({
// Whether to show replies directly below // Whether to show replies directly below
showRepliesBelow: function() { showRepliesBelow: function() {
var reply_count, _ref; var reply_count, topic;
reply_count = this.get('reply_count'); reply_count = this.get('reply_count');
// We don't show replies if there aren't any // We don't show replies if there aren't any
@ -280,9 +280,9 @@ Discourse.Post = Discourse.Model.extend({
if (reply_count > 1) return true; if (reply_count > 1) return true;
// If we have *exactly* one reply, we have to consider if it's directly below us // If we have *exactly* one reply, we have to consider if it's directly below us
if ((_ref = this.get('topic')) ? _ref.isReplyDirectlyBelow(this) : void 0) return false; topic = this.get('topic');
return !topic.isReplyDirectlyBelow(this);
return true;
}.property('reply_count') }.property('reply_count')
}); });

6
app/assets/javascripts/discourse/models/topic.js
View File

@ -257,14 +257,14 @@ Discourse.Topic = Discourse.Model.extend({
// Is the reply to a post directly below it? // Is the reply to a post directly below it?
isReplyDirectlyBelow: function(post) { isReplyDirectlyBelow: function(post) {
var postBelow, posts; var postBelow, posts;
posts = this.get('posts'); posts = this.get('postStream.posts');
if (!posts) return; if (!posts) return;
postBelow = posts[posts.indexOf(post) + 1]; postBelow = posts[posts.indexOf(post) + 1];
// If the post directly below's reply_to_post_number is our post number, it's // If the post directly below's reply_to_post_number is our post number, it's
// considered directly below. // considered directly below.
return (postBelow ? postBelow.get('reply_to_post_number') : void 0) === post.get('post_number'); return postBelow && postBelow.get('reply_to_post_number') === post.get('post_number');
}, },
hasExcerpt: function() { hasExcerpt: function() {
@ -299,7 +299,7 @@ Discourse.Topic.reopenClass({
**/ **/
findSimilarTo: function(title, body) { findSimilarTo: function(title, body) {
return Discourse.ajax("/topics/similar_to", { data: {title: title, raw: body} }).then(function (results) { return Discourse.ajax("/topics/similar_to", { data: {title: title, raw: body} }).then(function (results) {
return results.map(function(topic) { return Discourse.Topic.create(topic) }); return results.map(function(topic) { return Discourse.Topic.create(topic); });
}); });
}, },