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

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

@ -200,37 +200,41 @@ Discourse.TopicList.reopenClass({
list = session.get('topicList'), list = session.get('topicList'),
tracking = Discourse.TopicTrackingState.current(); tracking = Discourse.TopicTrackingState.current();
if (list && (list.get('filter') === filter)) { return new Ember.RSVP.Promise(function(resolve) {
list.set('loaded', true); // Try to use the cached version
if (list && (list.get('filter') === filter)) {
list.set('loaded', true);
if (tracking) { if (tracking) {
tracking.updateTopics(list.get('topics')); tracking.updateTopics(list.get('topics'));
}
return Ember.RSVP.resolve(list);
}
session.setProperties({topicList: null, topicListScrollPosition: null});
// Clean up any string parameters that might slip through
params = params || {};
Ember.keys(params).forEach(function(k) {
var val = params[k];
if (val === "undefined" || val === "null" || val === 'false') {
params[k] = undefined;
}
});
var findParams = {};
Discourse.SiteSettings.top_menu.split('|').forEach(function (i) {
if (i.indexOf(filter) === 0) {
var exclude = i.split("-");
if (exclude && exclude.length === 2) {
findParams.exclude_category = exclude[1];
} }
return resolve(list);
} }
});
return Discourse.TopicList.find(filter, _.extend(findParams, params || {})).then(function (list) { // Perform the search
session.setProperties({topicList: null, topicListScrollPosition: null});
// Clean up any string parameters that might slip through
params = params || {};
Ember.keys(params).forEach(function(k) {
var val = params[k];
if (val === "undefined" || val === "null" || val === 'false') {
params[k] = undefined;
}
});
var findParams = {};
Discourse.SiteSettings.top_menu.split('|').forEach(function (i) {
if (i.indexOf(filter) === 0) {
var exclude = i.split("-");
if (exclude && exclude.length === 2) {
findParams.exclude_category = exclude[1];
}
}
});
return resolve(Discourse.TopicList.find(filter, _.extend(findParams, params || {})));
}).then(function(list) {
if (tracking) { if (tracking) {
tracking.sync(list, list.filter); tracking.sync(list, list.filter);
tracking.trackIncoming(list.filter); tracking.trackIncoming(list.filter);