From 1d601134edf0745b5e2a26eb45777281b47d672a Mon Sep 17 00:00:00 2001
From: Leo Franchi <leo@zulip.com>
Date: Fri, 21 Feb 2014 10:46:26 -0500
Subject: [PATCH] Don't error out if we get an edit for a message that's out of
 view

(imported from commit 042cadc8657d048d0fd3a410af5adbbaeac7d92d)
---
 static/js/message_edit.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/js/message_edit.js b/static/js/message_edit.js
index a9eaf13142..32766b9ef1 100644
--- a/static/js/message_edit.js
+++ b/static/js/message_edit.js
@@ -169,7 +169,8 @@ exports.is_editing = function (id) {
 
 exports.end = function (row) {
     var message = current_msg_list.get(rows.id(row));
-    if (currently_editing_messages[message.id] !== undefined) {
+    if (message !== undefined &&
+        currently_editing_messages[message.id] !== undefined) {
         var scroll_by = currently_editing_messages[message.id].scrolled_by;
         viewport.scrollTop(viewport.scrollTop() - scroll_by);
         delete currently_editing_messages[message.id];