From 5dd82c2980a15f913df258d674355c72196abb4e Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 6 Nov 2017 08:32:47 +0100 Subject: Fix rendering of original sender in reply body Signed-off-by: Christoph Wurst --- js/views/messageview.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/js/views/messageview.js b/js/views/messageview.js index 80f7be5ac..ac3b85f05 100644 --- a/js/views/messageview.js +++ b/js/views/messageview.js @@ -38,6 +38,20 @@ define(function(require) { replyComposer: '#reply-composer', attachments: '.mail-message-attachments' }, + + /** + * @private + * @param {type} email + * @returns {undefined} + */ + _formatAddress: function(address) { + if (address.label === address.email) { + return address.email; + } + + return '"' + address.label + '" <' + address.email + '>'; + }, + initialize: function(options) { this.account = options.account; this.folder = options.folder; @@ -52,7 +66,7 @@ define(function(require) { var text = HtmlHelper.htmlToText(this.messageBody.get('body')); this.reply.body = '\n\n\n\n' + - this.messageBody.get('from') + ' – ' + + this._formatAddress(this.messageBody.get('from')[0]) + ' – ' + $.datepicker.formatDate('D, d. MM yy ', date) + date.getHours() + ':' + (minutes < 10 ? '0' : '') + minutes + '\n> ' + text.replace(/\n/g, '\n> '); -- cgit v1.2.3 From d14dbbf7d7516a5835317c95d25e317bcef39cb3 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 13 Nov 2017 09:07:05 +0100 Subject: Only show the label as original sender Signed-off-by: Christoph Wurst --- js/views/composerview.js | 2 +- js/views/messageview.js | 15 +-------------- 2 files changed, 2 insertions(+), 15 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 ac3b85f05..3da3a21e9 100644 --- a/js/views/messageview.js +++ b/js/views/messageview.js @@ -39,19 +39,6 @@ define(function(require) { attachments: '.mail-message-attachments' }, - /** - * @private - * @param {type} email - * @returns {undefined} - */ - _formatAddress: function(address) { - if (address.label === address.email) { - return address.email; - } - - return '"' + address.label + '" <' + address.email + '>'; - }, - initialize: function(options) { this.account = options.account; this.folder = options.folder; @@ -66,7 +53,7 @@ define(function(require) { var text = HtmlHelper.htmlToText(this.messageBody.get('body')); this.reply.body = '\n\n\n\n' + - this._formatAddress(this.messageBody.get('from')[0]) + ' – ' + + 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> '); -- cgit v1.2.3