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 #4541 from xfalcox/no-last-visit-on-top 

FIX: Last Visit line shouldn't appear on /top
This commit is contained in:
Jeff Atwood 2016-11-08 23:08:40 +01:00 committed by GitHub
parent 86522a52b7 bd77f5cb72
commit 13a40d2f99
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/components/topic-list.js.es6
View File

@ -40,12 +40,12 @@ export default Ember.Component.extend({
} }
}, },
@observes('topics', 'order', 'ascending', 'category') @observes('topics', 'order', 'ascending', 'category', 'top')
lastVisitedTopicChanged() { lastVisitedTopicChanged() {
this.refreshLastVisited(); this.refreshLastVisited();
}, },
_updateLastVisitedTopic(topics, order, ascending) { _updateLastVisitedTopic(topics, order, ascending, top) {
this.set('lastVisitedTopic', null); this.set('lastVisitedTopic', null);
@ -57,6 +57,10 @@ export default Ember.Component.extend({
return; return;
} }
if (top) {
return;
}
if (!topics || topics.length === 1) { if (!topics || topics.length === 1) {
return; return;
} }
@ -103,7 +107,7 @@ export default Ember.Component.extend({
}, },
refreshLastVisited() { refreshLastVisited() {
this._updateLastVisitedTopic(this.get('topics'), this.get('order'), this.get('ascending')); this._updateLastVisitedTopic(this.get('topics'), this.get('order'), this.get('ascending'), this.get('top'));
}, },
click(e) { click(e) {

1
app/assets/javascripts/discourse/templates/discovery/topics.hbs
View File

@ -34,6 +34,7 @@
{{#if hasTopics}} {{#if hasTopics}}
{{topic-list {{topic-list
highlightLastVisited=true highlightLastVisited=true
top=top
showTopicPostBadges=showTopicPostBadges showTopicPostBadges=showTopicPostBadges
showPosters=true showPosters=true
currentUser=currentUser currentUser=currentUser