fixup! remove incorrect date reset bugfix

Author: Narretz

src/.eslintrc.json

@@ -79,6 +79,7 @@
     "toJsonReplacer": false,
     "toJson": false,
     "fromJson": false,
+    "addDateMinutes": false,
     "convertTimezoneToLocal": false,
     "timezoneToOffset": false,
     "startingTag": false,

src/Angular.js

@@ -75,6 +75,7 @@
   fromJson,
   convertTimezoneToLocal,
   timezoneToOffset,
+  addDateMinutes,
   startingTag,
   tryDecodeURIComponent,
   parseKeyValue,

src/ng/directive/input.js

@@ -1432,19 +1432,26 @@ function createDateInputType(type, regexp, parseDate, format) {
     badInputChecker(scope, element, attr, ctrl);
     baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
     var previousDate;
+    var previousTimezone;
 
     ctrl.$$parserName = type;
     ctrl.$parsers.push(function(value) {
-      if (ctrl.$isEmpty(value)) {
-        previousDate = null;
-        return null;
-      }
+      if (ctrl.$isEmpty(value)) return null;
+
       if (regexp.test(value)) {
+        var timezone = ctrl.$options.getOption('timezone');
+
         // Note: We cannot read ctrl.$modelValue, as there might be a different
         // parser/formatter in the processing chain so that the model
         // contains some different data format!
+        if (timezone && previousTimezone && previousTimezone !== timezone) {
+          // If the timezone has changed, adjust the previousDate to the default timzeone
+          // so that the new date is converted with the correct timezone offset
+          previousDate = addDateMinutes(previousDate, timezoneToOffset(previousTimezone, 0));
+        }
+
         var parsedDate = parseDate(value, previousDate);
-        var timezone = ctrl.$options.getOption('timezone');
+
         if (timezone) {
           parsedDate = convertTimezoneToLocal(parsedDate, timezone);
         }
@@ -1460,12 +1467,14 @@ function createDateInputType(type, regexp, parseDate, format) {
       if (isValidDate(value)) {
         previousDate = value;
         var timezone = ctrl.$options.getOption('timezone');
-        if (previousDate && timezone) {
+        if (timezone) {
+          previousTimezone = timezone;
           previousDate = convertTimezoneToLocal(previousDate, timezone, true);
         }
         return $filter('date')(value, format, timezone);
       } else {
         previousDate = null;
+        previousTimezone = null;
         return '';
       }
     });

src/ng/directive/ngModelOptions.js

@@ -330,6 +330,8 @@ defaultModelOptions = new ModelOptions({
  *     continental US time zone abbreviations, but for general use, use a time zone offset, for
  *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
  *     If not specified, the timezone of the browser will be used.
+ *     Note that changing the timezone will have no effect on the current date, and is only applied after
+ *     the next input / model change.
  *
  */
 var ngModelOptionsDirective = function() {

test/ng/directive/inputSpec.js

@@ -671,9 +671,9 @@ describe('input', function() {
       inputElm.controller('ngModel').$overrideModelOptions({timezone: '-0500'});
 
       $rootScope.$apply(function() {
-        $rootScope.value = new Date(Date.UTC(2014, 6, 1));
+        $rootScope.value = new Date(Date.UTC(2013, 6, 1));
       });
-      expect(inputElm.val()).toBe('2014-06');
+      expect(inputElm.val()).toBe('2013-06');
     });
 
 
@@ -955,9 +955,10 @@ describe('input', function() {
       inputElm.controller('ngModel').$overrideModelOptions({timezone: '+5000'});
 
       $rootScope.$apply(function() {
-        $rootScope.value = new Date(Date.UTC(2014, 0, 17));
+        // the 17. with an offset of +5000 moves the date into next week
+        $rootScope.value = new Date(Date.UTC(2013, 0, 18));
       });
-      expect(inputElm.val()).toBe('2014-W04');
+      expect(inputElm.val()).toBe('2013-W04');
     });
 
 
@@ -1876,7 +1877,7 @@ describe('input', function() {
 
       inputElm.controller('ngModel').$overrideModelOptions({timezone: 'UTC'});
       helper.changeInputValueTo('2000-01-01');
-      expect(+$rootScope.value).toBe(Date.UTC(2000, 0, 1, 19));
+      expect(+$rootScope.value).toBe(Date.UTC(2000, 0, 1, 0));
     });
 
 
@@ -1965,21 +1966,21 @@ describe('input', function() {
       dealoc(formElm);
     });
 
-    it('should not reuse the hour part of a previous date object after emptying the input', function() {
+    it('should not reuse the hour part of a previous date object after changing the timezone', function() {
       var inputElm = helper.compileInput('<input type="date" ng-model="value" ng-model-options="{timezone: \'UTC\'}" />');
 
       helper.changeInputValueTo('2000-01-01');
-      expect(+$rootScope.value).toBe(Date.UTC(2000, 0, 1));
+      expect(+$rootScope.value).toBe(Date.UTC(2000, 0, 1, 0));
 
       // Change the timezone offset so that the display date is a day earlier
       // This does not change the model, but our implementation
       // internally caches a Date object with this offset
       // and re-uses it if part of the date changes
       inputElm.controller('ngModel').$overrideModelOptions({timezone: '-0500'});
       $rootScope.$apply(function() {
-        $rootScope.value = new Date(Date.UTC(2001, 0, 1));
+        $rootScope.value = new Date(Date.UTC(2000, 0, 1, 0));
       });
-      expect(inputElm.val()).toBe('2000-12-31');
+      expect(inputElm.val()).toBe('1999-12-31');
 
       // Emptying the input should clear the cached date object
       helper.changeInputValueTo('');