Bladeren bron

Inform user of error messages which don't have text

JC Brand 7 jaren geleden
bovenliggende
commit
3153604823
2 gewijzigde bestanden met toevoegingen van 15 en 4 verwijderingen
  1. 7 1
      dist/converse.js
  2. 8 3
      src/converse-chatboxes.js

+ 7 - 1
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) {

+ 8 - 3
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) {