From 71203a996a00a97f5103fd432ca22e50aa44e462 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 22 Apr 2013 18:14:30 -0400 Subject: [PATCH] Fix autoscrolling on new messages. This was apparently broken by the final revision of our fix to the autoscrolling+narrow bugs, because it attempted to use jquery's animation queues to restrict which animations were stopped, and this doesn't seem to work. (imported from commit cf97f9f56dc5a16d1aa0322b5e6ec432a76d3be2) --- zephyr/static/js/message_list.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zephyr/static/js/message_list.js b/zephyr/static/js/message_list.js index 7e82908028..069817deaa 100644 --- a/zephyr/static/js/message_list.js +++ b/zephyr/static/js/message_list.js @@ -434,8 +434,7 @@ MessageList.prototype = { // viewport (which is window) doesn't have a scrollTop, so scroll // the closest concept that does. $("html, body").animate({scrollTop: viewport_offset + - Math.min(new_messages_height, available_space_for_scroll)}, - {"queue": "autoscroll"}); + Math.min(new_messages_height, available_space_for_scroll)}); } }, @@ -525,7 +524,8 @@ MessageList.prototype = { }; $(document).on('message_selected.zephyr hashchange.zephyr mousewheel', function (event) { - $("html, body").stop({"queue": "autoscroll"}); + // TODO: Figure out how to limit this animation stop to just the autoscroll + $("html, body").stop(); }); }()); /*jslint nomen: false */