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

FIX: Don't give weird progress numbers when there are deleted posts.

Browse Source
This commit is contained in:
Robin Ward
2013-12-02 15:09:25 -05:00
parent b37fae50e3
commit 0c259af374
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/controllers/topic_controller.js
+8 -7
View File
@@ -220,12 +220,13 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
},
jumpTopDisabled: function() {
return (this.get('progressPosition') === 1);
}.property('postStream.filteredPostsCount', 'progressPosition'),
return (this.get('progressPosition') <= 3);
}.property('progressPosition'),
jumpBottomDisabled: function() {
return this.get('progressPosition') >= this.get('postStream.filteredPostsCount');
}.property('postStream.filteredPostsCount', 'progressPosition'),
return this.get('progressPosition') >= this.get('postStream.filteredPostsCount') ||
this.get('progressPosition') >= this.get('highest_post_number');
}.property('postStream.filteredPostsCount', 'highest_post_number', 'progressPosition'),
canMergeTopic: function() {
if (!this.get('details.can_move_posts')) return false;
@@ -269,9 +270,9 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
streamPercentage: function() {
if (!this.get('postStream.loaded')) { return 0; }
if (this.get('postStream.filteredPostsCount') === 0) { return 0; }
return this.get('progressPosition') / this.get('postStream.filteredPostsCount');
}.property('postStream.loaded', 'progressPosition', 'postStream.filteredPostsCount'),
if (this.get('postStream.highest_post_number') === 0) { return 0; }
return this.get('progressPosition') / this.get('highest_post_number');
}.property('postStream.loaded', 'progressPosition', 'highest_post_number'),
multiSelectChanged: function() {
// Deselect all posts when multi select is turned off