Merge pull request #403 from candy-chat/feature/fix-info-message-html

Adds possibility to use HTML in info messages
candy-chat · Aug 4, 2015 · 99fe5a5 · 99fe5a5
2 parents 996fa08 + 31e21e1
commit 99fe5a5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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, {