diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js index 92dee7c..5d7fb96 100644 --- a/js/bootstrap-datepicker.js +++ b/js/bootstrap-datepicker.js @@ -528,7 +528,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));