Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
20fa8cb846
@ -175,9 +175,11 @@ EmailMessage = function(parent, args, list, idx) {
|
|||||||
wordWrap: 'break-word', textWrap: 'normal', overflowX: 'auto'},
|
wordWrap: 'break-word', textWrap: 'normal', overflowX: 'auto'},
|
||||||
|
|
||||||
// newlines for text email
|
// newlines for text email
|
||||||
(this.content_type=='text/plain' ? this.mail
|
(this.content_type=='text/plain'
|
||||||
.replace(/\n[ ]*\n[\n\t ]*/g, '\n\n') // excess whitespace
|
? this.mail
|
||||||
.replace(/\n/g, '<br>') : this.mail)
|
.replace(/\n[ ]*\n[\n\t ]*/g, '\n') // excess whitespace
|
||||||
|
.replace(/\n/g, '<br>')
|
||||||
|
: this.mail)
|
||||||
);
|
);
|
||||||
|
|
||||||
// show only first and last message
|
// show only first and last message
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user