osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Display correct post counts, even with a filter active

Browse Source
This commit is contained in:
Robin Ward
2013-03-26 14:18:35 -04:00
parent 5dc47c2d82
commit f1e2923a91
6 changed files with 98 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/controllers/topic_controller.js
+3 -4
View File
@@ -62,11 +62,9 @@ Discourse.TopicController = Discourse.ObjectController.extend({
hideProgress: function() {
if (!this.get('content.loaded')) return true;
if (!this.get('currentPost')) return true;
if (this.get('content.highest_post_number') < 2) return true;
if (this.get('bestOf')) return true;
if (this.get('userFilters.length')) return true;
if (this.get('content.filtered_posts_count') < 2) return true;
return false;
}.property('content.loaded', 'currentPost', 'bestOf', 'userFilters.length'),
}.property('content.loaded', 'currentPost', 'content.filtered_posts_count'),
selectPost: function(post) {
post.toggleProperty('selected');
@@ -215,6 +213,7 @@ Discourse.TopicController = Discourse.ObjectController.extend({
});
topicController.updateBottomBar();
topicController.set('filtered_posts_count', result.filtered_posts_count);
topicController.set('loadingBelow', false);
topicController.set('seenBottom', false);
});