diff options
| author | Michael Weibel <mweibel@users.noreply.github.com> | 2015-02-26 08:52:06 +0300 |
|---|---|---|
| committer | Michael Weibel <mweibel@users.noreply.github.com> | 2015-02-26 08:52:06 +0300 |
| commit | 794bb8ea58e0e181db0381b43de6174a090ab194 (patch) | |
| tree | 365dc22572842028caaaa352e8696d5e346395d4 | |
| parent | 9736a3c17ce12753af265d406b32f0512bfa8aa5 (diff) | |
| parent | 50dadecbdf246238f8de756f9c93e52dabd1e50a (diff) | |
Merge pull request #339 from Sudrien/admin_info_links
Allow links to render correctly in adminMessage and infoMessage
| -rw-r--r-- | src/view/pane/chat.js | 8 | ||||
| -rw-r--r-- | src/view/template.js | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/view/pane/chat.js b/src/view/pane/chat.js index cf154ea..5e73d51 100644 --- a/src/view/pane/chat.js +++ b/src/view/pane/chat.js @@ -215,6 +215,10 @@ Candy.View.Pane = (function(self, $) { */ adminMessage: function(subject, message) { if(Candy.View.getCurrent().roomJid) { // Simply dismiss admin 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) { + message = Candy.Util.parseAndCropXhtml(message, Candy.View.getOptions().crop.message.body); + } var timestamp = new Date(); var html = Mustache.to_html(Candy.View.Template.Chat.adminMessage, { subject: subject, @@ -264,6 +268,10 @@ Candy.View.Pane = (function(self, $) { */ onInfoMessage: function(roomJid, subject, 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) { + message = Candy.Util.parseAndCropXhtml(message, Candy.View.getOptions().crop.message.body); + } var timestamp = new Date(); var html = Mustache.to_html(Candy.View.Template.Chat.infoMessage, { subject: subject, diff --git a/src/view/template.js b/src/view/template.js index 0d51855..5c3c104 100644 --- a/src/view/template.js +++ b/src/view/template.js @@ -38,9 +38,9 @@ Candy.View.Template = (function(self){ '</div><div id="chat-modal-overlay"></div>', adminMessage: '<li><small data-timestamp="{{timestamp}}">{{time}}</small><div class="adminmessage">' + '<span class="label">{{sender}}</span>' + - '<span class="spacer">▸</span>{{subject}} {{message}}</div></li>', + '<span class="spacer">▸</span>{{subject}} {{{message}}}</div></li>', infoMessage: '<li><small data-timestamp="{{timestamp}}">{{time}}</small><div class="infomessage">' + - '<span class="spacer">•</span>{{subject}} {{message}}</div></li>', + '<span class="spacer">•</span>{{subject}} {{{message}}}</div></li>', toolbar: '<ul id="chat-toolbar">' + '<li id="emoticons-icon" data-tooltip="{{tooltipEmoticons}}"></li>' + '<li id="chat-sound-control" class="checked" data-tooltip="{{tooltipSound}}"></li>' + |