Inform user of error messages which don't have text

31536048 · JC Brand · a3fe6162 · 31536048 · 31536048
Commit 31536048 authored Jun 05, 2018 by JC Brand
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

dist/converse.js dist/converse.js +7 -1

src/converse-chatboxes.js src/converse-chatboxes.js +8 -3

No files found.
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -62477,7 +62477,13 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_

        getMessageBody(message) {
          const type = message.getAttribute('type');
-          return type === 'error' ? _.propertyOf(message.querySelector('error text'))('textContent') : _.propertyOf(message.querySelector('body'))('textContent');
+
+          if (type === 'error') {
+            const error = message.querySelector('error');
+            return _.propertyOf(error.querySelector('text'))('textContent') || __('Sorry, an error occured:') + ' ' + error.innerHTML;
+          } else {
+            return _.propertyOf(message.querySelector('body'))('textContent');
+          }
        },

        getMessageAttributesFromStanza(message, delay, original_stanza) {
--- a/src/converse-chatboxes.js
+++ b/src/converse-chatboxes.js
@@ -417,9 +417,14 @@

                getMessageBody (message) {
                    const type = message.getAttribute('type');
-                    return (type === 'error') ?
-                        _.propertyOf(message.querySelector('error text'))('textContent') :
-                            _.propertyOf(message.querySelector('body'))('textContent');
+                    if (type === 'error') {
+                        const error = message.querySelector('error');
+                        return _.propertyOf(error.querySelector('text'))('textContent') ||
+                            __('Sorry, an error occured:') + ' ' + error.innerHTML;
+                    } else {
+                        return _.propertyOf(message.querySelector('body'))('textContent');
+                    }
+
                },

                getMessageAttributesFromStanza (message, delay, original_stanza) {