From 8385e5fa96a35706f16951202fc8cff1de0c9a5d Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Sun, 17 Jan 2021 09:42:29 -0500 Subject: [PATCH] Removing tsjz for dayjs tz --- .../application/controllers/ShowbuilderController.php | 4 +++- .../public/js/airtime/nowplaying/lang-timezone-setup.js | 6 ++++-- airtime_mvc/public/js/js-timezone-detect/jstz-1.0.4.min.js | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 airtime_mvc/public/js/js-timezone-detect/jstz-1.0.4.min.js diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 82fa27b64..fa69c06d8 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -52,7 +52,9 @@ class ShowbuilderController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/main_builder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); // MEDIA BUILDER - $this->view->headScript()->appendFile($baseUrl.'js/js-timezone-detect/jstz-1.0.4.min.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'js/libs/dayjs.min.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'js/libs/utc.min.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'js/libs/timezone.min.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/podcast.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/publish.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js b/airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js index 9048fe926..a9f7d50a3 100644 --- a/airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js +++ b/airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js @@ -38,8 +38,10 @@ $(document).ready(function() { language = language.replace("-", "_"); $("#setup_language").val(language); - var timezone = jstz.determine(); - var timezone_name = timezone.name(); + dayjs.extend(utc) + dayjs.extend(timezone) + + var timezone_name = dayjs.tz.guess(); if (timezone_name === undefined) { timezone_name = "America/Toronto"; } diff --git a/airtime_mvc/public/js/js-timezone-detect/jstz-1.0.4.min.js b/airtime_mvc/public/js/js-timezone-detect/jstz-1.0.4.min.js deleted file mode 100644 index 96e3dd8ae..000000000 --- a/airtime_mvc/public/js/js-timezone-detect/jstz-1.0.4.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jstz - v1.0.4 - 2012-12-12 */ -(function(e){var t=function(){"use strict";var e="s",n=function(e){var t=-e.getTimezoneOffset();return t!==null?t:0},r=function(e,t,n){var r=new Date;return e!==undefined&&r.setFullYear(e),r.setDate(n),r.setMonth(t),r},i=function(e){return n(r(e,0,2))},s=function(e){return n(r(e,5,2))},o=function(e){var t=e.getMonth()>7?s(e.getFullYear()):i(e.getFullYear()),r=n(e);return t-r!==0},u=function(){var t=i(),n=s(),r=i()-s();return r<0?t+",1":r>0?n+",1,"+e:t+",0"},a=function(){var e=u();return new t.TimeZone(t.olson.timezones[e])};return{determine:a,date_is_dst:o}}();t.TimeZone=function(e){"use strict";var n=null,r=function(){return n},i=function(){var e=t.olson.ambiguity_list[n],r=e.length,i=0,s=e[0];for(;i