inline_message: add an extra mutation observer for when the msg_text_…

…inner element shows up in the DOM right after its parent msg_text
Yannick243 · May 22, 2024 · d1c727e · d1c727e
1 parent 4149028
commit d1c727e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/modules/core/site.js b/modules/core/site.js
@@ -2578,3 +2578,22 @@ const handleExternalResources = (inline) => {
 
     document.querySelector('.external_notices').insertAdjacentElement('beforebegin', noticesElement);
 };
+
+const observeMessageTextMutationAndHandleExternalResources = (inline) => {
+    const message = document.querySelector('.msg_text');
+    if (message) {
+        new MutationObserver(function (mutations) {
+            mutations.forEach(function (mutation) {
+                if (mutation.addedNodes.length > 0) {
+                    mutation.addedNodes.forEach(function (node) {
+                        if (node.classList.contains('msg_text_inner')) {
+                            handleExternalResources(inline);                    
+                        }
+                    });
+                }
+            });
+        }).observe(message, {
+            childList: true
+        });
+    }
+};
diff --git a/modules/imap/site.js b/modules/imap/site.js
@@ -1265,22 +1265,7 @@ var imap_hide_add_contact_popup = function(event) {
     popup.classList.toggle("show");
 };
 
-const message = document.querySelector('.msg_text');
-if (message) {
-    new MutationObserver(function (mutations) {
-        mutations.forEach(function (mutation) {
-            if (mutation.addedNodes.length > 0) {
-                mutation.addedNodes.forEach(function (node) {
-                    if (node.classList.contains('msg_text_inner')) {
-                        handleExternalResources();                    
-                    }
-                });
-            }
-        });
-    }).observe(message, {
-        childList: true
-    });
-}
+observeMessageTextMutationAndHandleExternalResources();
 
 const handleDownloadMsgSource = function() {
     const messageSource = document.querySelector('pre.msg_source');

diff --git a/modules/inline_message/site.js b/modules/inline_message/site.js
@@ -182,7 +182,8 @@ const messagesListMutation = new MutationObserver(function (mutations) {
         if (mutation.addedNodes.length > 0) {
             mutation.addedNodes.forEach(function (node) {
                 if (node.classList.contains('msg_text') || node.classList.contains('inline_msg')) {
-                    if(node.querySelector('.msg_text_inner')) {
+                    observeMessageTextMutationAndHandleExternalResources(true);
+                    if(node.querySelector('.msg_text_inner') && !document.querySelector('.external_notices')) {
                         handleExternalResources(true);
                     }
                 }