Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maintenance: update <time> tag rendering to match HTML specs

Browse source
This commit is contained in:
Mantas Masalskis 2020-05-14 15:32:20 +02:00 committed by Thorsten Eckel
parent 4d17b78181
commit e953090dc7
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/_application_controller.coffee
View file

@ -281,11 +281,6 @@ class App.Controller extends Spine.Controller
return true if @Session.get() return true if @Session.get()
false false
frontendTime: (timestamp, row = {}) ->
if !row['subclass']
row['subclass'] = ''
"<span class=\"humanTimeFromNow #{row.subclass}\" data-time=\"#{timestamp}\">?</span>"
frontendTimeUpdate: => frontendTimeUpdate: =>
update = => update = =>
@frontendTimeUpdateElement($('#app')) @frontendTimeUpdateElement($('#app'))
@ -299,7 +294,7 @@ class App.Controller extends Spine.Controller
) )
frontendTimeUpdateItem: (item, currentVal) => frontendTimeUpdateItem: (item, currentVal) =>
timestamp = item.data('time') timestamp = item.attr('datetime')
time = @humanTime(timestamp, item.hasClass('escalation')) time = @humanTime(timestamp, item.hasClass('escalation'))
# only do dom updates on changes # only do dom updates on changes

2
app/assets/javascripts/app/index.coffee
View file

@ -140,7 +140,7 @@ class App extends Spine.Controller
humanTime = '' humanTime = ''
if !table if !table
humanTime = App.PrettyDate.humanTime(resultLocal, escalation) 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' if !isHtmlEscape && typeof resultLocal is 'string'
resultLocal = App.Utils.htmlEscape(resultLocal) resultLocal = App.Utils.htmlEscape(resultLocal)

2
app/assets/javascripts/app/lib/mixins/view_helpers.coffee
View file

@ -135,7 +135,7 @@ App.ViewHelpers =
if escalation if escalation
cssClass += ' escalation' cssClass += ' escalation'
humanTime = App.PrettyDate.humanTime(time, 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`? # Why not just use `Icon: App.Utils.icon`?
# Because App.Utils isn't loaded until after this file. # Because App.Utils isn't loaded until after this file.

4
public/assets/tests/model_ui.js
View file

@ -44,7 +44,7 @@ test( "model ui basic tests", function() {
equal( App.viewPrint( ticket, 'state' ), 'open') equal( App.viewPrint( ticket, 'state' ), 'open')
equal( App.viewPrint( ticket, 'state_id' ), 'open') equal( App.viewPrint( ticket, 'state_id' ), 'open')
equal( App.viewPrint( ticket, 'not_existing' ), '-') 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, 'date' ), '02/07/2015')
equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>') 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' ), 'offen')
equal( App.viewPrint( ticket, 'state_id' ), 'offen') equal( App.viewPrint( ticket, 'state_id' ), 'offen')
equal( App.viewPrint( ticket, 'not_existing' ), '-') 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, 'date' ), '07.02.2015')
equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>') equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>')