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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2018-01-16 16:55:51 +01:00
commit e5d1111263
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/converse-chatview.js
View File

@ -520,7 +520,11 @@
},
getExtraMessageClasses (attrs) {
return 'onload ' + (attrs.delayed && 'delayed' || '');
if (window.converse_disable_effects) {
return attrs.delayed && 'delayed' || '';
} else {
return 'onload ' + (attrs.delayed && 'delayed' || '');
}
},
renderMessage (attrs) {
@ -562,7 +566,9 @@
'extra_classes': this.getExtraMessageClasses(attrs)
})
));
window.setTimeout(_.partial(u.removeClass, 'onload', msg), 2000);
if (!window.converse_disable_effects) {
window.setTimeout(_.partial(u.removeClass, 'onload', msg), 2000);
}
const msg_content = msg.querySelector('.chat-msg-content');
msg_content.innerHTML = u.addEmoji(
_converse, emojione, u.addHyperlinks(xss.filterXSS(text, {'whiteList': {}}))