Skip to content

Commit 9520d51

Browse files
committed
fix(DateObject): localDateValue() returns the wrong value for some days if there is a daylight savin
Now it uses the timezoneOffset of the specific day to calculate the localDateValue Closes #345
1 parent 3f393dd commit 9520d51

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/js/datetimepicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
}
421421

422422
function DateObject () {
423-
var tempDate = new Date()
423+
var tempDate = new Date(arguments[0].utcDateValue)
424424
var localOffset = tempDate.getTimezoneOffset() * 60000
425425

426426
this.utcDateValue = tempDate.getTime()

test/configuration/beforeRender.spec.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ describe('beforeRender', function () {
1414
var $compile
1515
beforeEach(module('ui.bootstrap.datetimepicker'))
1616
beforeEach(inject(function (_$compile_, _$rootScope_) {
17+
moment.tz.guess()
1718
moment.locale('en')
1819
$compile = _$compile_
1920
$rootScope = _$rootScope_
@@ -72,14 +73,16 @@ describe('beforeRender', function () {
7273
it('in day view $dates parameter contains 42 members', function () {
7374
$rootScope.date = moment('2014-01-01T00:00:00.000').toDate()
7475

75-
var offset = new Date().getTimezoneOffset() * 60000
76+
var offsetDate = new Date()
7677

7778
$rootScope.beforeRender = function (dates) {
7879
expect(dates.length).toBe(42)
7980
expect(dates[0].utcDateValue).toBe(1388275200000)
80-
expect(dates[0].localDateValue()).toBe(1388275200000 + offset)
81+
offsetDate.setTime(dates[0].utcDateValue)
82+
expect(dates[0].localDateValue()).toBe(1388275200000 + (offsetDate.getTimezoneOffset() * 60000))
8183
expect(dates[11].utcDateValue).toBe(1389225600000)
82-
expect(dates[11].localDateValue()).toBe(1389225600000 + offset)
84+
offsetDate.setTime(dates[11].utcDateValue)
85+
expect(dates[11].localDateValue()).toBe(1389225600000 + (offsetDate.getTimezoneOffset() * 60000))
8386
}
8487

8588
spyOn($rootScope, 'beforeRender').and.callThrough()

0 commit comments

Comments
 (0)