From 507d668e2eb8d0cc5175368813f35854bf61d74d Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Sun, 1 Mar 2020 12:38:50 -0800 Subject: [PATCH] this makes timezones work.. why this exact same code didn't work earlier is beyond me... --- Makefile | 5 ++--- root/js/solardash.base.js | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f74cdd1..da71c4d 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,8 @@ JSFILES = root/js/solardash.file.js root/js/solardash.https.js root/js/solardash THIRDPARTYJS = \ root/js/jquery.js \ root/js/highstock.js \ - -# root/js/moment.min.js \ -# root/js/moment-timezone-with-data.min.js + root/js/moment.min.js \ + root/js/moment-timezone-with-data.min.js root/js/jquery.js: wget -O $@ "https://code.jquery.com/jquery-3.4.1.min.js" || (rm "$@"; false) diff --git a/root/js/solardash.base.js b/root/js/solardash.base.js index 16af13a..078b69d 100644 --- a/root/js/solardash.base.js +++ b/root/js/solardash.base.js @@ -1,8 +1,8 @@ -//Highcharts.setOptions({ -// time: { -// timezone: 'America/Los_Angeles' -// } -//}); +Highcharts.setOptions({ + time: { + timezone: 'America/Los_Angeles' + } +}); socket.onopen = function() { // connected