Merge pull request thelounge#1244 from thelounge/xPaw/fix-page-keys

Correctly finish scroll animation when using page keys
matburnham · Jun 21, 2017 · 9e7ece9 · 9e7ece9
2 parents fdbcb50 + 5fb25bc
commit 9e7ece9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/client/js/lounge.js b/client/js/lounge.js
@@ -1306,15 +1306,14 @@ $(function() {
 			"pagedown"
 		], function(e, key) {
 			let container = windows.find(".window.active");
-			if (container.is(":animated")) {
-				return;
-			}
 
 			// Chat windows scroll message container
 			if (container.attr("id") === "chat-container") {
 				container = container.find(".chan.active .chat");
 			}
 
+			container.finish();
+
 			const offset = container.get(0).clientHeight * 0.9;
 			let scrollTop = container.scrollTop();
 
@@ -1324,7 +1323,7 @@ $(function() {
 				scrollTop = Math.ceil(scrollTop + offset);
 			}
 
-			container.stop().animate({
+			container.animate({
 				scrollTop: scrollTop
 			}, 200);