From 31e21e10605dd0b894a80d03f2fb4bfa5127733f Mon Sep 17 00:00:00 2001 From: Michael Weibel Date: Mon, 13 Jul 2015 07:58:39 +0200 Subject: Adds possibility to use HTML in info messages Fixes candy-chat/candy-plugins#139 --- src/view/pane/chat.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/view/pane/chat.js b/src/view/pane/chat.js index 61d7692..e12665e 100644 --- a/src/view/pane/chat.js +++ b/src/view/pane/chat.js @@ -293,9 +293,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, { -- cgit v1.2.3