Commit e5d11112 authored by Weblate's avatar Weblate

Merge remote-tracking branch 'origin/master'

parents 0f4b60de e2a545a8
......@@ -520,7 +520,11 @@
},
getExtraMessageClasses (attrs) {
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)
})
));
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': {}}))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment