Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/candy-chat/candy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weibel <michael.weibel@gmail.com>2015-07-13 08:58:39 +0300
committerMichael Weibel <michael.weibel@gmail.com>2015-07-13 08:58:39 +0300
commit31e21e10605dd0b894a80d03f2fb4bfa5127733f (patch)
tree48a6f3fa4d8c421d392bd84440bf1e4781024506
parented24c2006b25782bbc300e030bb73a2f09178d4b (diff)
Adds possibility to use HTML in info messagesfeature/fix-info-message-html
Fixes candy-chat/candy-plugins#139
-rw-r--r--src/view/pane/chat.js5
1 files 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, {