Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-08 12:06:51 +08:00
Code Packages Activity Actions 1

FIX: Back button breaks translation of incoming stuff

Browse source
This commit is contained in:
Robin Ward 2014-08-29 12:52:49 -04:00
parent ec42b61a4d
commit 16c9f073b5
1 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/discourse/models/topic_list.js
View file

@ -200,15 +200,18 @@ Discourse.TopicList.reopenClass({
list = session.get('topicList'),
tracking = Discourse.TopicTrackingState.current();
return new Ember.RSVP.Promise(function(resolve) {
// Try to use the cached version
if (list && (list.get('filter') === filter)) {
list.set('loaded', true);
if (tracking) {
tracking.updateTopics(list.get('topics'));
}
return Ember.RSVP.resolve(list);
return resolve(list);
}
// Perform the search
session.setProperties({topicList: null, topicListScrollPosition: null});
// Clean up any string parameters that might slip through
@ -229,8 +232,9 @@ Discourse.TopicList.reopenClass({
}
}
});
return resolve(Discourse.TopicList.find(filter, _.extend(findParams, params || {})));
return Discourse.TopicList.find(filter, _.extend(findParams, params || {})).then(function (list) {
}).then(function(list) {
if (tracking) {
tracking.sync(list, list.filter);
tracking.trackIncoming(list.filter);