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

FIX: Retain back button scroll position even if we don't load more.

This commit is contained in:
Robin Ward 2014-08-27 13:33:52 -04:00
parent f10d6ed88a
commit b1c0a3d01c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/models/topic_list.js
View File

@ -234,6 +234,7 @@ Discourse.TopicList.reopenClass({
tracking.sync(list, list.filter);
tracking.trackIncoming(list.filter);
}
Discourse.Session.currentProp('topicList', list);
return list;
});
},

4
app/assets/javascripts/discourse/routes/discovery_route.js
View File

@ -36,7 +36,9 @@ Discourse.DiscoveryRoute = Discourse.Route.extend(Discourse.ScrollTop, Discourse
var controller = this.controllerFor('discovery');
Ember.run.cancel(controller.get('scheduledSpinner'));
controller.setProperties({ loading: false, loadingSpinner: false });
this._scrollTop();
if (!Discourse.Session.currentProp('topicListScrollPosition')) {
this._scrollTop();
}
},
didTransition: function() {