am 3e21d671: am a153336e: am 3102a32e: am 6a304704: Merge "Add null check in JS before replacing message body" into ub-gmail-ur14-dev
* commit '3e21d671ef629cfdfd289f1240c0ce454459f549':
Add null check in JS before replacing message body
diff --git a/assets/script.js b/assets/script.js
index 2bf5d9c..32cc856 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -754,8 +754,14 @@
for (i = 0, len = messageIds.length; i < len; i++) {
id = messageIds[i];
msgContentDiv = document.querySelector("#" + id + " > .mail-message-content");
- msgContentDiv.innerHTML = window.mail.getMessageBody(id);
- processNewMessageBody(msgContentDiv);
+ // Check if we actually have a div before trying to replace this message body.
+ if (msgContentDiv) {
+ msgContentDiv.innerHTML = window.mail.getMessageBody(id);
+ processNewMessageBody(msgContentDiv);
+ } else {
+ // There's no message div, just skip it. We're in a really busted state.
+ console.log("Mail message content for msg " + id + " to replace not found.");
+ }
}
disablePostForms();
measurePositions();