github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 20:36:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced timeago with moment.fromNow

Browse Source
This commit is contained in:
CrypterEmerald 2021-11-15 12:59:16 +01:00
parent b83e4f53b1
commit 3172f8d413
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/grocy.js
View File

@ -316,7 +316,6 @@ if (window.localStorage.getItem("sidebar_state") === "collapsed")
$("#sidenavToggler").click(); $("#sidenavToggler").click();
} }
$.timeago.settings.allowFuture = true;
RefreshContextualTimeago = function(rootSelector = "#page-content") RefreshContextualTimeago = function(rootSelector = "#page-content")
{ {
$(rootSelector + " time.timeago").each(function() $(rootSelector + " time.timeago").each(function()
@ -352,7 +351,7 @@ RefreshContextualTimeago = function(rootSelector = "#page-content")
} }
else else
{ {
element.timeago("update", timestamp); element.text(moment(timestamp).fromNow());
} }
if (isDateWithoutTime) if (isDateWithoutTime)

2
views/layout/default.blade.php
View File

@ -697,8 +697,6 @@
<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-select-bs4/js/select.bootstrap4.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/datatables.net-select-bs4/js/select.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/timeago/jquery.timeago.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules', true) }}/timeago/locales/jquery.timeago.{{ $__t('timeago_locale') }}.js?v={{ $version }}"></script>
<script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/sprintf-js/dist/sprintf.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/sprintf-js/dist/sprintf.min.js?v=', true) }}{{ $version }}"></script>