diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-13 14:12:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 14:12:58 +0300 |
| commit | 2e102ec90cf64f2326020cad51a90c6f464b8d3d (patch) | |
| tree | 0220ee6cb65ee91c2be680dbb9047eeac95429d5 | |
| parent | bb6b35c79bfdeb35d7f68f8a73b10fc7cebacaa1 (diff) | |
| parent | d14dbbf7d7516a5835317c95d25e317bcef39cb3 (diff) | |
Merge pull request #600 from nextcloud/fix/reply-message-original-sender
Fix rendering of original sender in reply body
| -rw-r--r-- | js/views/composerview.js | 2 | ||||
| -rw-r--r-- | js/views/messageview.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/views/composerview.js b/js/views/composerview.js index 2735b922b..87646a7ed 100644 --- a/js/views/composerview.js +++ b/js/views/composerview.js @@ -420,7 +420,7 @@ define(function(require) { this.$('.message-body').first().text( '\n\n\n' + - from.email + ' – ' + + from.label + ' – ' + $.datepicker.formatDate('D, d. MM yy ', date) + date.getHours() + ':' + (minutes < 10 ? '0' : '') + minutes + '\n> ' + text.replace(/\n/g, '\n> ') diff --git a/js/views/messageview.js b/js/views/messageview.js index 80f7be5ac..3da3a21e9 100644 --- a/js/views/messageview.js +++ b/js/views/messageview.js @@ -38,6 +38,7 @@ define(function(require) { replyComposer: '#reply-composer', attachments: '.mail-message-attachments' }, + initialize: function(options) { this.account = options.account; this.folder = options.folder; @@ -52,7 +53,7 @@ define(function(require) { var text = HtmlHelper.htmlToText(this.messageBody.get('body')); this.reply.body = '\n\n\n\n' + - this.messageBody.get('from') + ' – ' + + this.messageBody.get('from')[0].label + ' – ' + $.datepicker.formatDate('D, d. MM yy ', date) + date.getHours() + ':' + (minutes < 10 ? '0' : '') + minutes + '\n> ' + text.replace(/\n/g, '\n> '); |