From 227ca5dd2386c2b05c018bd138eb2b357d3c0779 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 25 Jul 2014 17:02:19 -0400 Subject: [PATCH] FIX: Home logo wasn't scrolling to top if on second page of topic results. --- app/assets/javascripts/discourse/components/home-logo.js.es6 | 2 +- app/assets/javascripts/discourse/models/topic_list.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/home-logo.js.es6 b/app/assets/javascripts/discourse/components/home-logo.js.es6 index 649a4ce45a7..1e1545033c3 100644 --- a/app/assets/javascripts/discourse/components/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/components/home-logo.js.es6 @@ -26,7 +26,7 @@ export default Ember.Component.extend({ // When you click the logo, never use a cached list var session = Discourse.Session.current(); - session.setProperties({topicList: null, topicListScrollPos: null}); + session.setProperties({topicList: null, topicListScrollPosition: null}); Discourse.URL.routeTo('/'); return false; diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js index afede7cbbb8..583538cbadd 100644 --- a/app/assets/javascripts/discourse/models/topic_list.js +++ b/app/assets/javascripts/discourse/models/topic_list.js @@ -8,7 +8,6 @@ **/ function finderFor(filter, params) { - return function() { var url = Discourse.getURL("/") + filter + ".json"; @@ -209,7 +208,7 @@ Discourse.TopicList.reopenClass({ list.set('loaded', true); return Ember.RSVP.resolve(list); } - session.setProperties({topicList: null, topicListScrollPos: null}); + session.setProperties({topicList: null, topicListScrollPosition: null}); var findParams = {}; Discourse.SiteSettings.top_menu.split('|').forEach(function (i) {