Fix formatting messages with newlines

diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index c2fa08ed20e8d7f4d16e6dede684517cae333af9..bc496f2e599b5e8925df09b0ce394fe7c3ef24f7 100644 (file)
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -38,7 +38,7 @@
                '        <div class="author">{{actorDisplayName}}</div>' +
                '        <div class="date has-tooltip" title="{{altDate}}">{{date}}</div>' +
                '    </div>' +
-               '    <div class="message">{{message}}</div>' +
+               '    <div class="message">{{{formattedMessage}}}</div>' +
                '</li>';
 
        /**
@@ -122,7 +122,8 @@
                        var timestamp = new Date(commentModel.get('creationDateTime')).getTime();
                        var data = _.extend({
                                date: OC.Util.relativeModifiedDate(timestamp),
-                               altDate: OC.Util.formatDate(timestamp)
+                               altDate: OC.Util.formatDate(timestamp),
+                               formattedMessage: this._formatMessage(commentModel.get('message'))
                        }, commentModel.attributes);
                        // TODO: format
                        return data;
@@ -165,6 +166,14 @@
                        }
                },
 
+               /**
+                * Convert a message to be displayed in HTML,
+                * converts newlines to <br> tags.
+                */
+               _formatMessage: function(message) {
+                       return escapeHTML(message).replace(/\n/g, '<br/>');
+               },
+
                nextPage: function() {
                        if (this._loading || !this.collection.hasMoreResults()) {
                                return;