X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5a3b04f7177afe202ab4f8776b5ca2567b4fdabe..47221ee04bee623850c559274b5ff64fe3068ae6:/apps/workbench/app/assets/javascripts/dates.js diff --git a/apps/workbench/app/assets/javascripts/dates.js b/apps/workbench/app/assets/javascripts/dates.js index eeb6edea1c..903fb01cb5 100644 --- a/apps/workbench/app/assets/javascripts/dates.js +++ b/apps/workbench/app/assets/javascripts/dates.js @@ -1,13 +1,15 @@ jQuery(function($){ $(document).on('ajax:complete arv:pane:loaded ready', function() { $('[data-utc-date]').each(function(i, elm) { - console.log("woble!"); + // Try matching the date using a couple of different formats. var v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d) UTC/); if (!v) { v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z/); } if (v) { + // Create a new date object from the timestamp so the browser can + // render the date based on the locale/timezone. var ts = new Date(Date.UTC(v[1], v[2]-1, v[3], v[4], v[5], v[6])); if ($(elm).attr('data-utc-date-opts') && $(elm).attr('data-utc-date-opts').match(/noseconds/)) { $(elm).text((ts.getHours() > 12 ? (ts.getHours()-12) : ts.getHours())