Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Bugfix. Error messages don't have associated vcards

Browse Source
This commit is contained in:
JC Brand 2018-10-02 18:04:03 +02:00
parent ba37826d44
commit 148eaeacf5
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/converse.js vendored
View File

@ -60321,7 +60321,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}, },
setVCard() { setVCard() {
if (this.get('type') === 'groupchat') { if (this.get('type') === 'error') {
return;
} else if (this.get('type') === 'groupchat') {
this.vcard = this.getVCardForChatroomOccupant(); this.vcard = this.getVCardForChatroomOccupant();
} else { } else {
const jid = this.get('from'); const jid = this.get('from');
@ -67523,7 +67525,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}, },
initialize() { initialize() {
if (this.model.vcard) {
this.model.vcard.on('change', this.render, this); this.model.vcard.on('change', this.render, this);
}
this.model.on('change:correcting', this.onMessageCorrection, this); this.model.on('change:correcting', this.onMessageCorrection, this);
this.model.on('change:message', this.render, this); this.model.on('change:message', this.render, this);
this.model.on('change:progress', this.renderFileUploadProgresBar, this); this.model.on('change:progress', this.renderFileUploadProgresBar, this);
@ -67575,7 +67580,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
renderChatMessage() { renderChatMessage() {
const is_me_message = this.isMeCommand(), const is_me_message = this.isMeCommand(),
moment_time = moment(this.model.get('time')), moment_time = moment(this.model.get('time')),
role = this.model.vcard.get('role'), role = this.model.vcard ? this.model.vcard.get('role') : null,
roles = role ? role.split(',') : []; roles = role ? role.split(',') : [];
const msg = u.stringToElement(tpl_message(_.extend(this.model.toJSON(), { const msg = u.stringToElement(tpl_message(_.extend(this.model.toJSON(), {
'__': __, '__': __,

4
src/converse-chatboxes.js
View File

@ -109,7 +109,9 @@
}, },
setVCard () { setVCard () {
if (this.get('type') === 'groupchat') { if (this.get('type') === 'error') {
return;
} else if (this.get('type') === 'groupchat') {
this.vcard = this.getVCardForChatroomOccupant(); this.vcard = this.getVCardForChatroomOccupant();
} else { } else {
const jid = this.get('from'); const jid = this.get('from');

4
src/converse-message-view.js
View File

@ -58,7 +58,9 @@
}, },
initialize () { initialize () {
if (this.model.vcard) {
this.model.vcard.on('change', this.render, this); this.model.vcard.on('change', this.render, this);
}
this.model.on('change:correcting', this.onMessageCorrection, this); this.model.on('change:correcting', this.onMessageCorrection, this);
this.model.on('change:message', this.render, this); this.model.on('change:message', this.render, this);
this.model.on('change:progress', this.renderFileUploadProgresBar, this); this.model.on('change:progress', this.renderFileUploadProgresBar, this);
@ -105,7 +107,7 @@
renderChatMessage () { renderChatMessage () {
const is_me_message = this.isMeCommand(), const is_me_message = this.isMeCommand(),
moment_time = moment(this.model.get('time')), moment_time = moment(this.model.get('time')),
role = this.model.vcard.get('role'), role = this.model.vcard ? this.model.vcard.get('role') : null,
roles = role ? role.split(',') : []; roles = role ? role.split(',') : [];
const msg = u.stringToElement(tpl_message( const msg = u.stringToElement(tpl_message(