kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Optimized datetimepicker relative time display handling

Browse Source
This commit is contained in:
Bernd Bestel 2022-03-07 17:57:14 +01:00
parent 632a542236
commit 7532626123
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/grocy.js
View File

@ -338,7 +338,7 @@ RefreshContextualTimeago = function(rootSelector = "#page-content")
var timestamp = element.attr("datetime"); var timestamp = element.attr("datetime");
if (timestamp.isEmpty()) if (timestamp.isEmpty() || timestamp.length < 10)
{ {
element.text("") element.text("")
return return

3
public/viewjs/components/datetimepicker.js
View File

@ -238,6 +238,9 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
} }
} }
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker.GetValue());
RefreshContextualTimeago(".datetimepicker-wrapper");
//Custom validation //Custom validation
value = Grocy.Components.DateTimePicker.GetValue(); value = Grocy.Components.DateTimePicker.GetValue();
dateObj = moment(value, format, true); dateObj = moment(value, format, true);

3
public/viewjs/components/datetimepicker2.js
View File

@ -238,6 +238,9 @@ Grocy.Components.DateTimePicker2.GetInputElement().on('keyup', function(e)
} }
} }
$('#datetimepicker2-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue());
RefreshContextualTimeago(".datetimepicker2-wrapper");
//Custom validation //Custom validation
value = Grocy.Components.DateTimePicker2.GetValue(); value = Grocy.Components.DateTimePicker2.GetValue();
dateObj = moment(value, format, true); dateObj = moment(value, format, true);