Fix undefined conversation view

humhub · Apr 15, 2024 · 847405b · 847405b
1 parent 2b24cf3
commit 847405b
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 36 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 3.2.1 (Unreleased)
 ------------------------
 - Enh #370: Remove message entries on disable module
+- Fix #385: Fix undefined conversation view
 
 3.2.0 (January 29, 2024)
 ------------------------

diff --git a/resources/js/humhub.mail.inbox.js b/resources/js/humhub.mail.inbox.js
@@ -1,5 +1,4 @@
 humhub.module('mail.inbox', function (module, require, $) {
-
     var Widget = require('ui.widget').Widget;
     var Filter = require('ui.filter').Filter;
     var view = require('ui.view');
@@ -177,17 +176,14 @@ humhub.module('mail.inbox', function (module, require, $) {
     };
 
     ConversationList.prototype.updateActiveItem = function() {
-
-        var activeMessageId = Widget.instance('#mail-conversation-root').getActiveMessageId();
-
         this.$.find('.entry').removeClass('selected');
 
         // Set new selection
-        this.$.find('.entry').removeClass('selected');
-        var $selected = this.$.find('[data-message-id="' + activeMessageId + '"]');
-
-        if($selected.length) {
-            $selected.removeClass('unread').addClass('selected');
+        if (getRoot()) {
+            var $selected = this.$.find('[data-message-id="' + getRoot().getActiveMessageId() + '"]');
+            if ($selected.length) {
+                $selected.removeClass('unread').addClass('selected');
+            }
         }
     };
 
@@ -204,8 +200,8 @@ humhub.module('mail.inbox', function (module, require, $) {
         return new Promise(function (resolve) {
             if(view.isSmall() && $('.mail-conversation-single-message').length) {
                 $('.inbox-wrapper').slideUp(function() {
-                    if($('#mail-conversation-root').length) {
-                        Widget.instance('#mail-conversation-root').updateSize();
+                    if (getRoot()) {
+                        getRoot().updateSize();
                     }
                     resolve();
                 });
@@ -218,8 +214,8 @@ humhub.module('mail.inbox', function (module, require, $) {
         return new Promise(function (resolve) {
             if(view.isSmall()) {
                 $('.inbox-wrapper').slideDown(function() {
-                    if($('#mail-conversation-root').length) {
-                        Widget.instance('#mail-conversation-root').updateSize();
+                    if (getRoot()) {
+                        getRoot().updateSize();
                     }
 
                     resolve();
@@ -232,7 +228,9 @@ humhub.module('mail.inbox', function (module, require, $) {
     var toggleInbox = function() {
         if(view.isSmall()) {
             $('.inbox-wrapper').slideToggle(function() {
-                Widget.instance('#mail-conversation-root').updateSize();
+                if (getRoot()) {
+                    getRoot().updateSize();
+                }
             });
         }
     };
@@ -248,10 +246,18 @@ humhub.module('mail.inbox', function (module, require, $) {
         });
     };
 
+    var root = null;
+    var getRoot = function () {
+        if (!root) {
+            root = Widget.instance('#mail-conversation-root');
+        }
+        return root;
+    };
+
     module.export({
         ConversationList: ConversationList,
         Filter: ConversationFilter,
         setTagFilter: setTagFilter,
         toggleInbox: toggleInbox
     });
-});
+});
diff --git a/resources/js/humhub.mail.messenger.bundle.js b/resources/js/humhub.mail.messenger.bundle.js
@@ -441,7 +441,6 @@ humhub.module('mail.ConversationEntry', function (module, require, $) {
     module.export = ConversationEntry;
 });
 humhub.module('mail.inbox', function (module, require, $) {
-
     var Widget = require('ui.widget').Widget;
     var Filter = require('ui.filter').Filter;
     var view = require('ui.view');
@@ -619,17 +618,14 @@ humhub.module('mail.inbox', function (module, require, $) {
     };
 
     ConversationList.prototype.updateActiveItem = function() {
-
-        var activeMessageId = Widget.instance('#mail-conversation-root').getActiveMessageId();
-
         this.$.find('.entry').removeClass('selected');
 
         // Set new selection
-        this.$.find('.entry').removeClass('selected');
-        var $selected = this.$.find('[data-message-id="' + activeMessageId + '"]');
-
-        if($selected.length) {
-            $selected.removeClass('unread').addClass('selected');
+        if (getRoot()) {
+            var $selected = this.$.find('[data-message-id="' + getRoot().getActiveMessageId() + '"]');
+            if ($selected.length) {
+                $selected.removeClass('unread').addClass('selected');
+            }
         }
     };
 
@@ -646,8 +642,8 @@ humhub.module('mail.inbox', function (module, require, $) {
         return new Promise(function (resolve) {
             if(view.isSmall() && $('.mail-conversation-single-message').length) {
                 $('.inbox-wrapper').slideUp(function() {
-                    if($('#mail-conversation-root').length) {
-                        Widget.instance('#mail-conversation-root').updateSize();
+                    if (getRoot()) {
+                        getRoot().updateSize();
                     }
                     resolve();
                 });
@@ -660,8 +656,8 @@ humhub.module('mail.inbox', function (module, require, $) {
         return new Promise(function (resolve) {
             if(view.isSmall()) {
                 $('.inbox-wrapper').slideDown(function() {
-                    if($('#mail-conversation-root').length) {
-                        Widget.instance('#mail-conversation-root').updateSize();
+                    if (getRoot()) {
+                        getRoot().updateSize();
                     }
 
                     resolve();
@@ -674,7 +670,9 @@ humhub.module('mail.inbox', function (module, require, $) {
     var toggleInbox = function() {
         if(view.isSmall()) {
             $('.inbox-wrapper').slideToggle(function() {
-                Widget.instance('#mail-conversation-root').updateSize();
+                if (getRoot()) {
+                    getRoot().updateSize();
+                }
             });
         }
     };
@@ -690,13 +688,22 @@ humhub.module('mail.inbox', function (module, require, $) {
         });
     };
 
+    var root = null;
+    var getRoot = function () {
+        if (!root) {
+            root = Widget.instance('#mail-conversation-root');
+        }
+        return root;
+    };
+
     module.export({
         ConversationList: ConversationList,
         Filter: ConversationFilter,
         setTagFilter: setTagFilter,
         toggleInbox: toggleInbox
     });
-});
+});
+
 humhub.module('mail.conversation', function (module, require, $) {
     var Widget = require('ui.widget').Widget;
     var modal = require('ui.modal');

diff --git a/resources/js/humhub.mail.messenger.bundle.min.js b/resources/js/humhub.mail.messenger.bundle.min.js
diff --git a/resources/js/humhub.mail.notification.js b/resources/js/humhub.mail.notification.js
@@ -68,9 +68,10 @@ humhub.module('mail.notification', function (module, require, $) {
     };
 
     var loadMessage = function (evt) {
-        if ($('#mail-conversation-root').length) {
-            Widget.instance('#mail-conversation-root').loadMessage(evt);
-            $('#mail-conversation-root').closest('.container').addClass('mail-conversation-single-message');
+        var root = Widget.instance('#mail-conversation-root');
+        if (root) {
+            root.loadMessage(evt);
+            root.$.closest('.container').addClass('mail-conversation-single-message');
         } else {
             client.redirect(evt.url);
         }
@@ -88,4 +89,4 @@ humhub.module('mail.notification', function (module, require, $) {
         updateCount: updateCount,
         getNewMessageCount: getNewMessageCount,
     });
-});
+});
diff --git a/resources/js/humhub.mail.notification.min.js b/resources/js/humhub.mail.notification.min.js