File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 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 ( )
Original file line number Diff line number Diff 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 ( )
You can’t perform that action at this time.
0 commit comments