From 4cd92a1cd9ccaa6889b312ea49fe9df3e315251a Mon Sep 17 00:00:00 2001 From: Alan Dipert Date: Tue, 26 Mar 2019 17:44:38 -0700 Subject: [PATCH] Add 'Fix datepicker DST bug' as patch - Original commit: 0683b79 --- .../000-fix-datepicker-dst-bug.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tools/datepicker-patches/000-fix-datepicker-dst-bug.patch diff --git a/tools/datepicker-patches/000-fix-datepicker-dst-bug.patch b/tools/datepicker-patches/000-fix-datepicker-dst-bug.patch new file mode 100644 index 000000000..fdb293e2c --- /dev/null +++ b/tools/datepicker-patches/000-fix-datepicker-dst-bug.patch @@ -0,0 +1,23 @@ +diff --git a/inst/www/shared/datepicker/js/bootstrap-datepicker.js b/inst/www/shared/datepicker/js/bootstrap-datepicker.js +index 76a99fc2..97f5c086 100644 +--- a/inst/www/shared/datepicker/js/bootstrap-datepicker.js ++++ b/inst/www/shared/datepicker/js/bootstrap-datepicker.js +@@ -529,7 +529,17 @@ + }, + + _utc_to_local: function(utc){ +- return utc && new Date(utc.getTime() + (utc.getTimezoneOffset()*60000)); ++ ++ if (!utc) return utc; ++ ++ var local = new Date(utc.getTime() + (utc.getTimezoneOffset() * 60000)); ++ ++ if (local.getTimezoneOffset() != utc.getTimezoneOffset()) ++ { ++ local = new Date(utc.getTime() + (local.getTimezoneOffset() * 60000)); ++ } ++ ++ return utc && local; + }, + _local_to_utc: function(local){ + return local && new Date(local.getTime() - (local.getTimezoneOffset()*60000));