From d44d2b3f105035ecb2609680cac0425e73aa17f1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 11 Feb 2014 15:17:36 -0500 Subject: [PATCH] FIX: Was not resuming scroll position on back button --- .../discourse/views/discovery_topics_view.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/views/discovery_topics_view.js b/app/assets/javascripts/discourse/views/discovery_topics_view.js index 00b9528bace..311916fdd99 100644 --- a/app/assets/javascripts/discourse/views/discovery_topics_view.js +++ b/app/assets/javascripts/discourse/views/discovery_topics_view.js @@ -7,7 +7,7 @@ @namespace Discourse @module Discourse **/ -Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.ScrollTop, Discourse.LoadMore, { +Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.LoadMore, { eyelineSelector: '.topic-list-item', actions: { @@ -25,6 +25,15 @@ Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.ScrollTop, Disco } }, + _readjustScrollPosition: function() { + var scrollTo = Discourse.Session.currentProp('topicListScrollPosition'); + if (scrollTo) { + Em.run.schedule('afterRender', function() { + $(window).scrollTop(scrollTo); + }); + } + }.on('didInsertElement'), + _updateTitle: function() { Discourse.notifyTitle(this.get('controller.topicTrackingState.incomingCount')); }.observes('controller.topicTrackingState.incomingCount'),