diff options
author | Ben Langfeld <ben@langfeld.me> | 2015-08-04 19:47:16 +0300 |
---|---|---|
committer | Ben Langfeld <ben@langfeld.me> | 2015-08-04 19:47:16 +0300 |
commit | 99fe5a53b29208cced02759ad6cb1ba54d993737 (patch) | |
tree | 92b883dcf7024b841e1d9cb742926a5e456f5969 | |
parent | 996fa08b492a708efb184e00b76e7d822acbe6ca (diff) | |
parent | 31e21e10605dd0b894a80d03f2fb4bfa5127733f (diff) |
Merge pull request #403 from candy-chat/feature/fix-info-message-html
Adds possibility to use HTML in info messages
-rw-r--r-- | src/view/pane/chat.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/view/pane/chat.js b/src/view/pane/chat.js index 44293b2..31d5984 100644 --- a/src/view/pane/chat.js +++ b/src/view/pane/chat.js @@ -294,9 +294,10 @@ Candy.View.Pane = (function(self, $) { onInfoMessage: function(roomJid, subject, message) { message = message || ''; if(Candy.View.getCurrent().roomJid && self.Chat.rooms[roomJid]) { // Simply dismiss info message if no room joined so far. TODO: maybe we should show those messages on a dedicated pane? - message = Candy.Util.Parser.all(message.substring(0, Candy.View.getOptions().crop.message.body)); - if(Candy.View.getOptions().enableXHTML === true) { + if(Candy.View.getOptions().enableXHTML === true && message.length > 0) { message = Candy.Util.parseAndCropXhtml(message, Candy.View.getOptions().crop.message.body); + } else { + message = Candy.Util.Parser.all(message.substring(0, Candy.View.getOptions().crop.message.body)); } var timestamp = new Date(); var html = Mustache.to_html(Candy.View.Template.Chat.infoMessage, { |