From 46ed231c548420d43037b75a0732b6a5fffed432 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 6 Feb 2015 12:21:24 +1030
Subject: [PATCH] Clean up scrolling code

---
 ember/app/components/discussions/stream-content.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ember/app/components/discussions/stream-content.js b/ember/app/components/discussions/stream-content.js
index 703314ba9..7d6b11efb 100644
--- a/ember/app/components/discussions/stream-content.js
+++ b/ember/app/components/discussions/stream-content.js
@@ -180,16 +180,14 @@ export default Ember.Component.extend({
 	},
 
 	scrollToItem: function($item, noAnimation) {
-		var $container = $('html, body');
+		var $container = $('html, body').stop(true);
 		if ($item.length) {
 			var marginTop = this.getMarginTop();
 			var scrollTop = $item.is(':first-child') ? 0 : $item.offset().top - marginTop;
-			if (scrollTop !== $(document).scrollTop()) {
-				if (noAnimation) {
-					$container.stop(true).scrollTop(scrollTop);
-				} else {
-					$container.stop(true).animate({scrollTop: scrollTop});
-				}
+			if (noAnimation) {
+				$container.scrollTop(scrollTop);
+			} else if (scrollTop !== $(document).scrollTop()) {
+				$container.animate({scrollTop: scrollTop});
 			}
 		}
 		return $container.promise();