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 #4475 from xfalcox/last-visit-adjusts 

FIX: Last visit must keep working when changing categories
This commit is contained in:
Sam 2016-10-04 19:31:22 +11:00 committed by GitHub
parent 3d7558c3b7 5476dee52d
commit baecaddef0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,9 @@ export default Ember.Component.extend({
@computed('topics.@each', 'order', 'ascending') @computed('topics.@each', 'order', 'ascending')
lastVisitedTopic(topics, order, ascending) { lastVisitedTopic(topics, order, ascending) {
this._cleanLastVisitedTopic();
if (!this.get('highlightLastVisited')) { return; } if (!this.get('highlightLastVisited')) { return; }
if (order !== "default" && order !== "activity") { return; } if (order !== "default" && order !== "activity") { return; }
if (!topics || topics.length === 1) { return; } if (!topics || topics.length === 1) { return; }
@ -85,7 +88,6 @@ export default Ember.Component.extend({
}, },
@observes('category') @observes('category')
@on('willDestroyElement')
_cleanLastVisitedTopic() { _cleanLastVisitedTopic() {
const prevTopic = this.get('prevTopic'); const prevTopic = this.get('prevTopic');