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

Merge pull request #2771 from techAPJ/patch-1 

Don't show new topic indicator on New tab
This commit is contained in:
Robin Ward 2014-09-08 15:35:23 -04:00
parent 56eda5abf9 80510c5114
commit 9d9d93ad3c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
View File

@ -122,6 +122,7 @@ var controllerOpts = {
showTable: Em.computed.or('hasTopics', 'topicTrackingState.hasIncoming'),
allLoaded: Em.computed.empty('more_topics_url'),
latest: Discourse.computed.endWith('filter', 'latest'),
new: Discourse.computed.endWith('filter', 'new'),
top: Em.computed.notEmpty('period'),
yearly: Em.computed.equal('period', 'yearly'),
monthly: Em.computed.equal('period', 'monthly'),

2
app/assets/javascripts/discourse/controllers/topic-list-item.js.es6
View File

@ -13,6 +13,7 @@ export default Ember.ObjectController.extend({
canStar: Em.computed.alias('controllers.discovery/topics.currentUser.id'),
bulkSelectEnabled: Em.computed.alias('controllers.discovery/topics.bulkSelectEnabled'),
showTopicPostBadges: Em.computed.not('controllers.discovery/topics.new'),
checked: function(key, value) {
var selected = this.get('controllers.discovery/topics.selected'),
@ -44,4 +45,3 @@ export default Ember.ObjectController.extend({
}
}
});

4
app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
View File

@ -13,7 +13,9 @@
<td class='main-link clearfix' {{bind-attr colspan="titleColSpan"}}>
{{topic-status topic=this.model}}
{{topic-link this}}
{{topic-post-badges unread=unread newPosts=displayNewPosts unseen=unseen url=lastUnreadUrl}}
{{#if showTopicPostBadges}}
{{topic-post-badges unread=unread newPosts=displayNewPosts unseen=unseen url=lastUnreadUrl}}
{{/if}}
{{#if hasExcerpt}}
<div class="topic-excerpt">