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

Fixed multiple datetimepicker contextual timeago (references #1520)

Browse Source
This commit is contained in:
Bernd Bestel 2021-06-24 07:46:32 +02:00
parent 5e189c8a4a
commit f8fa5db3e7
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,7 @@ Grocy.Components.DateTimePicker.GetInputElement().on('input', function(e)
{ {
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker.GetValue()); $('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker.GetValue());
EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan')); EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan'));
RefreshContextualTimeago("#datetimepicker-wrapper"); RefreshContextualTimeago(".datetimepicker-wrapper");
}); });
$('.datetimepicker').on('update.datetimepicker', function(e) $('.datetimepicker').on('update.datetimepicker', function(e)

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

@ -271,7 +271,7 @@ Grocy.Components.DateTimePicker2.GetInputElement().on('input', function(e)
{ {
$('#datetimepicker2-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue()); $('#datetimepicker2-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue());
EmptyElementWhenMatches('#datetimepicker2-timeago', __t('timeago_nan')); EmptyElementWhenMatches('#datetimepicker2-timeago', __t('timeago_nan'));
RefreshContextualTimeago("#datetimepicker2-wrapper"); RefreshContextualTimeago(".datetimepicker2-wrapper");
}); });
$('.datetimepicker2').on('update.datetimepicker', function(e) $('.datetimepicker2').on('update.datetimepicker', function(e)

2
views/components/datetimepicker.blade.php
View File

@ -16,7 +16,7 @@
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
@php if(empty($activateNumberPad)) { $activateNumberPad = false; } @endphp @php if(empty($activateNumberPad)) { $activateNumberPad = false; } @endphp
<div id="datetimepicker-wrapper" <div class="datetimepicker-wrapper"
class="form-group {{ $additionalGroupCssClasses }}"> class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }} <label for="{{ $id }}">{{ $__t($label) }}
@if(!empty($hint)) @if(!empty($hint))

2
views/components/datetimepicker2.blade.php
View File

@ -15,7 +15,7 @@
@php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
<div id="datetimepicker2-wrapper" <div class="datetimepicker2-wrapper"
class="form-group {{ $additionalGroupCssClasses }}"> class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }} <label for="{{ $id }}">{{ $__t($label) }}
@if(!empty($hint)) @if(!empty($hint))