fix(datepicker): properly handle timezone for minDate/maxDate

mgcrea · Jan 21, 2014 · d4a6424 · d4a6424
1 parent bf51874
commit d4a6424
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -338,10 +338,11 @@ angular.module('mgcrea.ngStrap.datepicker', ['mgcrea.ngStrap.tooltip'])
         angular.forEach(['minDate', 'maxDate'], function(key) {
           // console.warn('attr.$observe(%s)', key, attr[key]);
           angular.isDefined(attr[key]) && attr.$observe(key, function(newValue) {
-            // console.warn('attr.$observe(%s)=%o', key, newValue, !!datepicker);
+            // console.warn('attr.$observe(%s)=%o', key, newValue);
             if(newValue === 'now' || newValue === 'today') newValue = null;
             if(newValue.match(/^".+"$/)) newValue = newValue.substr(1, newValue.length - 2);
-            datepicker.$options[key] = +new Date(newValue);
+            var parsedDate = new Date(newValue);
+            datepicker.$options[key] = parsedDate.getTime() - parsedDate.getTimezoneOffset() * 6e4;
             !isNaN(datepicker.$options[key]) && datepicker.$build();
           });
         });

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
@@ -245,10 +245,10 @@ describe('datepicker', function() {
       it('should support a dynamic maxDate', function() {
         var elm = compileDirective('options-maxDate');
         angular.element(elm[0]).triggerHandler('focus');
-        expect(sandboxEl.find('.dropdown-menu tbody button[disabled]').length).toBe(7);
+        expect(sandboxEl.find('.dropdown-menu tbody button[disabled]').length).toBe(6);
         scope.maxDate = '02/12/86';
         scope.$digest();
-        expect(sandboxEl.find('.dropdown-menu tbody button[disabled]').length).toBe(17);
+        expect(sandboxEl.find('.dropdown-menu tbody button[disabled]').length).toBe(16);
       });
 
     });