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

FIX: Scroll position when hitting back button to category filter

This commit is contained in:
Robin Ward 2014-09-12 14:07:04 -04:00
parent 1e880fd5e1
commit 6f149edecc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/routes/build-category-route.js.es6
View File

@ -9,7 +9,7 @@ export default function(filter, params) {
return Discourse.Category.findBySlug(modelParams.slug, modelParams.parentSlug); return Discourse.Category.findBySlug(modelParams.slug, modelParams.parentSlug);
}, },
afterModel: function(model, transaction) { afterModel: function(model, transition) {
if (!model) { if (!model) {
this.replaceWith('/404'); this.replaceWith('/404');
return; return;
@ -17,7 +17,7 @@ export default function(filter, params) {
this._setupNavigation(model); this._setupNavigation(model);
return Em.RSVP.all([this._createSubcategoryList(model), return Em.RSVP.all([this._createSubcategoryList(model),
this._retrieveTopicList(model, transaction)]); this._retrieveTopicList(model, transition)]);
}, },
_setupNavigation: function(model) { _setupNavigation: function(model) {
@ -46,13 +46,14 @@ export default function(filter, params) {
return Em.RSVP.resolve(); return Em.RSVP.resolve();
}, },
_retrieveTopicList: function(model, transaction) { _retrieveTopicList: function(model, transition) {
var listFilter = "category/" + Discourse.Category.slugFor(model) + "/l/" + filter, var listFilter = "category/" + Discourse.Category.slugFor(model) + "/l/" + filter,
self = this; self = this;
var findOpts = filterQueryParams(transaction.queryParams, params); var findOpts = filterQueryParams(transition.queryParams, params),
extras = { cached: this.isPoppedState(transition) };
return Discourse.TopicList.list(listFilter, findOpts).then(function(list) { return Discourse.TopicList.list(listFilter, findOpts, extras).then(function(list) {
// If all the categories are the same, we can hide them // If all the categories are the same, we can hide them
var hideCategory = !list.get('topics').find(function (t) { return t.get('category') !== model; }); var hideCategory = !list.get('topics').find(function (t) { return t.get('category') !== model; });
list.set('hideCategory', hideCategory); list.set('hideCategory', hideCategory);