From dd06ca781a29ec7a203dd3e675d2d0c27bbb4372 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Mon, 15 Aug 2016 11:37:39 +0800
Subject: [PATCH] MDL-54687 core_message: scroll to bottom of messages on page
 load

---
 message/amd/src/message_area_messages.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/message/amd/src/message_area_messages.js b/message/amd/src/message_area_messages.js
index 34d66446f1a..e00a2d9d680 100644
--- a/message/amd/src/message_area_messages.js
+++ b/message/amd/src/message_area_messages.js
@@ -95,6 +95,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
                 this._sendMessageHandler.bind(this));
 
             $(document).on(AutoRows.events.ROW_CHANGE, this._adjustMessagesAreaHeight.bind(this));
+
+            // Scroll to the bottom of the messages when first initialised.
+            this._scrollBottom();
         };
 
         /**
@@ -425,7 +428,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
         Messages.prototype._scrollBottom = function() {
             // Scroll to the bottom.
             var messages = this.messageArea.find(this.messageArea.SELECTORS.MESSAGES);
-            messages.scrollTop(messages[0].scrollHeight);
+            if (messages.length !== 0) {
+                messages.scrollTop(messages[0].scrollHeight);
+            }
         };
 
         /**