File tree 2 files changed +7
-4
lines changed
2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 420
420
}
421
421
422
422
function DateObject ( ) {
423
- var tempDate = new Date ( )
423
+ var tempDate = new Date ( arguments [ 0 ] . utcDateValue )
424
424
var localOffset = tempDate . getTimezoneOffset ( ) * 60000
425
425
426
426
this . utcDateValue = tempDate . getTime ( )
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ describe('beforeRender', function () {
14
14
var $compile
15
15
beforeEach ( module ( 'ui.bootstrap.datetimepicker' ) )
16
16
beforeEach ( inject ( function ( _$compile_ , _$rootScope_ ) {
17
+ moment . tz . guess ( )
17
18
moment . locale ( 'en' )
18
19
$compile = _$compile_
19
20
$rootScope = _$rootScope_
@@ -72,14 +73,16 @@ describe('beforeRender', function () {
72
73
it ( 'in day view $dates parameter contains 42 members' , function ( ) {
73
74
$rootScope . date = moment ( '2014-01-01T00:00:00.000' ) . toDate ( )
74
75
75
- var offset = new Date ( ) . getTimezoneOffset ( ) * 60000
76
+ var offsetDate = new Date ( )
76
77
77
78
$rootScope . beforeRender = function ( dates ) {
78
79
expect ( dates . length ) . toBe ( 42 )
79
80
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 ) )
81
83
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 ) )
83
86
}
84
87
85
88
spyOn ( $rootScope , 'beforeRender' ) . and . callThrough ( )
You can’t perform that action at this time.
0 commit comments