diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 0c190244a..dc3aaaff8 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -45,7 +45,7 @@ setTimeout(function() { this.view.resize(); this.view.scrollToBottom(); - }.bind(this), 0); + }.bind(this), 10); }, events: { diff --git a/js/views/message_list_view.js b/js/views/message_list_view.js index a3d1990c9..9b18dc362 100644 --- a/js/views/message_list_view.js +++ b/js/views/message_list_view.js @@ -28,12 +28,10 @@ var Whisper = Whisper || {}; }, scrollToBottom: function() { // TODO: Avoid scrolling if user has manually scrolled up? - this.resize(); this.$el.scrollTop(this.el.scrollHeight); }, addAll: function() { Whisper.ListView.prototype.addAll.apply(this, arguments); // super() - this.resize(); this.scrollToBottom(); } });