From e953090dc71535bb99c2394f32f2403e5bc8df4f Mon Sep 17 00:00:00 2001
From: Mantas Masalskis <mm@zammad.com>
Date: Thu, 14 May 2020 15:32:20 +0200
Subject: [PATCH] Maintenance: update <time> tag rendering to match HTML specs

---
 .../app/controllers/_application_controller.coffee         | 7 +------
 app/assets/javascripts/app/index.coffee                    | 2 +-
 app/assets/javascripts/app/lib/mixins/view_helpers.coffee  | 2 +-
 public/assets/tests/model_ui.js                            | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee
index 53c7c5bc5..32b24b0b4 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.coffee
@@ -281,11 +281,6 @@ class App.Controller extends Spine.Controller
     return true if @Session.get()
     false
 
-  frontendTime: (timestamp, row = {}) ->
-    if !row['subclass']
-      row['subclass'] = ''
-    "<span class=\"humanTimeFromNow #{row.subclass}\" data-time=\"#{timestamp}\">?</span>"
-
   frontendTimeUpdate: =>
     update = =>
       @frontendTimeUpdateElement($('#app'))
@@ -299,7 +294,7 @@ class App.Controller extends Spine.Controller
     )
 
   frontendTimeUpdateItem: (item, currentVal) =>
-    timestamp = item.data('time')
+    timestamp = item.attr('datetime')
     time      = @humanTime(timestamp, item.hasClass('escalation'))
 
     # only do dom updates on changes
diff --git a/app/assets/javascripts/app/index.coffee b/app/assets/javascripts/app/index.coffee
index f08d85ce1..4901183c8 100644
--- a/app/assets/javascripts/app/index.coffee
+++ b/app/assets/javascripts/app/index.coffee
@@ -140,7 +140,7 @@ class App extends Spine.Controller
         humanTime = ''
         if !table
           humanTime = App.PrettyDate.humanTime(resultLocal, escalation)
-        resultLocal = "<time class=\"humanTimeFromNow #{cssClass}\" data-time=\"#{resultLocal}\" title=\"#{timestamp}\">#{humanTime}</time>"
+        resultLocal = "<time class=\"humanTimeFromNow #{cssClass}\" datetime=\"#{resultLocal}\" title=\"#{timestamp}\">#{humanTime}</time>"
 
       if !isHtmlEscape && typeof resultLocal is 'string'
         resultLocal = App.Utils.htmlEscape(resultLocal)
diff --git a/app/assets/javascripts/app/lib/mixins/view_helpers.coffee b/app/assets/javascripts/app/lib/mixins/view_helpers.coffee
index ccad90de6..2d41d48e7 100644
--- a/app/assets/javascripts/app/lib/mixins/view_helpers.coffee
+++ b/app/assets/javascripts/app/lib/mixins/view_helpers.coffee
@@ -135,7 +135,7 @@ App.ViewHelpers =
     if escalation
       cssClass += ' escalation'
     humanTime = App.PrettyDate.humanTime(time, escalation)
-    "<time class=\"humanTimeFromNow #{cssClass}\" data-time=\"#{time}\" title=\"#{timestamp}\">#{humanTime}</time>"
+    "<time class=\"humanTimeFromNow #{cssClass}\" datetime=\"#{time}\" title=\"#{timestamp}\">#{humanTime}</time>"
 
   # Why not just use `Icon: App.Utils.icon`?
   # Because App.Utils isn't loaded until after this file.
diff --git a/public/assets/tests/model_ui.js b/public/assets/tests/model_ui.js
index f43e95c14..bbb463327 100644
--- a/public/assets/tests/model_ui.js
+++ b/public/assets/tests/model_ui.js
@@ -44,7 +44,7 @@ test( "model ui basic tests", function() {
   equal( App.viewPrint( ticket, 'state' ), 'open')
   equal( App.viewPrint( ticket, 'state_id' ), 'open')
   equal( App.viewPrint( ticket, 'not_existing' ), '-')
-  equal( App.viewPrint( ticket, 'updated_at' ), '<time class="humanTimeFromNow " data-time="2014-11-07T23:43:08.000Z" title="11/07/2014 23:43">11/07/2014</time>')
+  equal( App.viewPrint( ticket, 'updated_at' ), '<time class="humanTimeFromNow " datetime="2014-11-07T23:43:08.000Z" title="11/07/2014 23:43">11/07/2014</time>')
   equal( App.viewPrint( ticket, 'date' ), '02/07/2015')
   equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>')
 
@@ -55,7 +55,7 @@ test( "model ui basic tests", function() {
   equal( App.viewPrint( ticket, 'state' ), 'offen')
   equal( App.viewPrint( ticket, 'state_id' ), 'offen')
   equal( App.viewPrint( ticket, 'not_existing' ), '-')
-  equal( App.viewPrint( ticket, 'updated_at' ), '<time class="humanTimeFromNow " data-time="2014-11-07T23:43:08.000Z" title="07.11.2014 23:43">07.11.2014</time>')
+  equal( App.viewPrint( ticket, 'updated_at' ), '<time class="humanTimeFromNow " datetime="2014-11-07T23:43:08.000Z" title="07.11.2014 23:43">07.11.2014</time>')
   equal( App.viewPrint( ticket, 'date' ), '07.02.2015')
   equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>')