From 0f484d0ed5df6356f95aaffdc935576f3dcfd5b3 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Wed, 2 Jan 2019 17:26:43 +0100 Subject: [PATCH] Fixed bug: App.PrettyDate.humanTime generates broken HTML markup if escalation flag is true. --- .../javascripts/app/lib/app_post/pretty_date.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee index d60b1071d..670dce162 100644 --- a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee +++ b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee @@ -36,7 +36,7 @@ class App.PrettyDate if type is 'timestamp' string = App.i18n.translateTimestamp(time) if escalation - string = "#{string}" + string = "#{string}" return string if type is 'absolute' && (direction is 'past' || direction is 'future') @@ -59,7 +59,7 @@ class App.PrettyDate else string = "#{App.i18n.translateInline(weekday)} #{App.i18n.translateTimestamp(time)}" if escalation - string = "#{string}" + string = "#{string}" return string if direction is 'past' && !escalation && diff > ( 60 * 60 * 24 * 7 ) @@ -86,7 +86,7 @@ class App.PrettyDate else string = App.i18n.translateInline('in %s', string) if escalation - string = "#{string}" + string = "#{string}" return string # hours @@ -110,7 +110,7 @@ class App.PrettyDate else string = App.i18n.translateInline('in %s', string) if escalation - string = "#{string}" + string = "#{string}" return string # minutes @@ -130,7 +130,7 @@ class App.PrettyDate else string = App.i18n.translateInline('in %s', string) if escalation - string = "#{string}" + string = "#{string}" return string @s: (num, digits) ->