From 7d2786388a77d6102bc661c186a90ca502d1218d Mon Sep 17 00:00:00 2001 From: Michael Joyce Date: Tue, 10 Apr 2018 14:57:17 -0700 Subject: [PATCH] Issue #7 - Fix missing default UTC option in format helpers --- bliss/gui/static/js/bliss/format.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bliss/gui/static/js/bliss/format.js b/bliss/gui/static/js/bliss/format.js index d14e4393..c0d962e1 100644 --- a/bliss/gui/static/js/bliss/format.js +++ b/bliss/gui/static/js/bliss/format.js @@ -17,7 +17,7 @@ import { DOY, timezone } from './time' -function adjustUTCtoGPS(obj, {gps = true, utc_gps_offset = 0}) { +function adjustUTCtoGPS(obj, {gps = true, utc = false, utc_gps_offset = 0}) { if (gps) { let datetime = normalize(obj) datetime.setSeconds(datetime.getSeconds() + utc_gps_offset) @@ -25,7 +25,7 @@ function adjustUTCtoGPS(obj, {gps = true, utc_gps_offset = 0}) { } -function date (obj, { doy = false, gps = true } = {}) { +function date (obj, { doy = false, gps = true, utc = false } = {}) { let yyyy, mm, dd, formatted let date = normalize(obj) @@ -93,7 +93,7 @@ function pad3 (n) { } -function time (obj, { h24 = true, gps = true } = {}) { +function time (obj, { h24 = true, gps = true, utc = false } = {}) { let hh, mm, ss, formatted let suffix = ' AM' let time = normalize(obj)