diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee index dad482357..266e7d3e1 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.coffee @@ -795,6 +795,9 @@ class App.Utils try content = $('
').html(message) catch e then content = $('
').html('
' + message + '
') + # ignore mail structures of case Ticket#1085048 + return message if content.find("div:first span:contains('CAUTION:')").css('color') == 'rgb(156, 101, 0)' + content.contents().each (index, node) -> text = $(node).text() if node.nodeType == Node.TEXT_NODE diff --git a/public/assets/tests/html_utils.js b/public/assets/tests/html_utils.js index 4d7663670..62c4b339d 100644 --- a/public/assets/tests/html_utils.js +++ b/public/assets/tests/html_utils.js @@ -1083,6 +1083,12 @@ test("identify signature by HTML", function() { result = App.Utils.signatureIdentifyByHtml(message) equal(result, should) + // ignore mail structures of case Ticket#1085048 + message = '
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.

actual content

actual content 2

 

actual quote

actual quote

 

 

' + should = '
CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.

actual content

actual content 2

 

actual quote

actual quote

 

 

' + result = App.Utils.signatureIdentifyByHtml(message) + equal(result, should) + // Gmail via Safari on MacOS 10.12 message = '
Reply with gmail via Safari on MacOS 10.12

\
\ @@ -3303,6 +3309,8 @@ App.Utils.htmlImage2DataUrlAsyncInline($('#image2data2'), {success: htmlImage2Da } test('App.Utils.baseUrl()', function() { + configGetBackup = App.Config.get + // When FQDN is undefined or null, // expect @baseUrl() to return window.location.origin App.Config.get = function(key) { return undefined } @@ -3338,6 +3346,8 @@ test('App.Utils.baseUrl()', function() { } } equal(App.Utils.baseUrl(), 'http://bar.zammad.com', 'with any other FQDN (and http scheme)') + + App.Config.get = configGetBackup }); test('App.Utils.joinUrlComponents()', function() {