- Fix: Error thorwn if no lastEntry of conversation could be found

- Fix: Script error logged in case conversation message list not found
humhub · Nov 5, 2020 · 80cb6a4 · 80cb6a4
1 parent 9f47a8c
commit 80cb6a4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/models/Message.php b/models/Message.php
@@ -278,6 +278,10 @@ public function delete()
 
     public function getPreview()
     {
+        if(!$this->lastEntry) {
+            return 'No message found';
+        }
+
         return RichText::preview($this->lastEntry->content, 80);
     }
 

diff --git a/resources/js/humhub.mail.ConversationView.js b/resources/js/humhub.mail.ConversationView.js
@@ -204,6 +204,12 @@ humhub.module('mail.ConversationView', function (module, require, $) {
     };
 
     ConversationView.prototype.isScrolledToBottom = function (tolerance) {
+        var $list = this.getListNode();
+
+        if(!$list.length) {
+            return false;
+        }
+
         tolerance = tolerance || 0;
         var list = this.getListNode()[0];
         return list.scrollHeight - list.offsetHeight - list.scrollTop <= tolerance;
@@ -314,6 +320,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
             setTimeout(function() {
                 that.$.imagesLoaded(function() {
                     var $list = that.getListNode();
+                    if(!$list.length) {
+                        return;
+                    }
+
                     that.updateSize(false).then(function () {
                         $list[0].scrollTop = $list[0].scrollHeight;
                         resolve()

diff --git a/resources/js/humhub.mail.messenger.bundle.js b/resources/js/humhub.mail.messenger.bundle.js
@@ -204,6 +204,12 @@ humhub.module('mail.ConversationView', function (module, require, $) {
     };
 
     ConversationView.prototype.isScrolledToBottom = function (tolerance) {
+        var $list = this.getListNode();
+
+        if(!$list.length) {
+            return false;
+        }
+
         tolerance = tolerance || 0;
         var list = this.getListNode()[0];
         return list.scrollHeight - list.offsetHeight - list.scrollTop <= tolerance;
@@ -314,6 +320,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
             setTimeout(function() {
                 that.$.imagesLoaded(function() {
                     var $list = that.getListNode();
+                    if(!$list.length) {
+                        return;
+                    }
+
                     that.updateSize(false).then(function () {
                         $list[0].scrollTop = $list[0].scrollHeight;
                         resolve()