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

Don't assume the parent is the top-level message element.

Browse Source
This commit is contained in:
JC Brand 2016-11-02 13:42:20 +00:00
parent 151a476084
commit 02864fd175
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/converse-chatview.js
View File

@ -337,18 +337,21 @@
"Output has been shortened."),
true, true);
}
return $(template(
_.extend(this.getExtraMessageTemplateAttributes(attrs), {
'msgid': attrs.msgid,
'sender': attrs.sender,
'time': msg_time.format('hh:mm'),
'isodate': msg_time.format(),
'username': username,
'extra_classes': extra_classes
})
)).find('.chat-msg-content').first().text(text)
.addHyperlinks()
.addEmoticons(converse.visible_toolbar_buttons.emoticons).parent();
var $msg = $(template(
_.extend(this.getExtraMessageTemplateAttributes(attrs), {
'msgid': attrs.msgid,
'sender': attrs.sender,
'time': msg_time.format('hh:mm'),
'isodate': msg_time.format(),
'username': username,
'extra_classes': extra_classes
})
));
$msg.find('.chat-msg-content').first()
.text(text)
.addHyperlinks()
.addEmoticons(converse.visible_toolbar_buttons.emoticons);
return $msg;
},
showHelpMessages: function (msgs, type, spinner) {