From 9fd935285f6d0f4e625409e96d0ba4cf8211bd3d Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 8 Feb 2015 15:57:33 +1030 Subject: [PATCH] Fix index pane autoscroll --- framework/core/ember/app/views/index.js | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/framework/core/ember/app/views/index.js b/framework/core/ember/app/views/index.js index 423078fd0..6453382bf 100644 --- a/framework/core/ember/app/views/index.js +++ b/framework/core/ember/app/views/index.js @@ -55,19 +55,21 @@ export default Ember.View.extend({ }, scrollToDiscussion: function() { - var view = this; - Ember.run.scheduleOnce('afterRender', function() { - var $index = view.$('.index-area'); - var $discussion = $index.find('.discussion-summary.active'); - if ($discussion.length) { - var indexTop = $index.offset().top; - var discussionTop = $discussion.offset().top; - if (discussionTop < indexTop || discussionTop + $discussion.outerHeight() > indexTop + $index.outerHeight()) { - $index.scrollTop($index.scrollTop() - indexTop + discussionTop); + if (this.get('controller.paned')) { + var view = this; + Ember.run.scheduleOnce('afterRender', function() { + var $index = view.$('.index-area'); + var $discussion = $index.find('.discussion-summary.active'); + if ($discussion.length) { + var indexTop = $index.offset().top; + var discussionTop = $discussion.offset().top; + if (discussionTop < indexTop || discussionTop + $discussion.outerHeight() > indexTop + $index.outerHeight()) { + $index.scrollTop($index.scrollTop() - indexTop + discussionTop); + } } - } - }); - }.observes('controller.controllers.discussion.model'), + }); + } + }.observes('controller.paned'), populateSidebarDefault: function(sidebar) { var view = this;