fix(ngModel): do not reset bound date objects

Closes #6666

Author: btford

src/ng/directive/input.js

@@ -1007,7 +1007,7 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
   };
 }
 
-function weekParser(isoWeek) {
+function weekParser(isoWeek, existingDate) {
   if (isDate(isoWeek)) {
     return isoWeek;
   }
@@ -1020,16 +1020,33 @@ function weekParser(isoWeek) {
           week = +parts[2],
           firstThurs = getFirstThursdayOfYear(year),
           addDays = (week - 1) * 7;
+
+      if (existingDate) {
+        return new Date(year, 0, firstThurs.getDate() + addDays,
+            existingDate.getHours(),
+            existingDate.getMinutes(),
+            existingDate.getSeconds(),
+            existingDate.getMilliseconds());
+      }
       return new Date(year, 0, firstThurs.getDate() + addDays);
     }
   }
 
   return NaN;
 }
 
+var DATE_METHOD_MAPPING = {
+  yyyy: 'FullYear',
+  MM: 'Month',
+  dd: 'Date',
+  HH: 'Hours',
+  mm: 'Minutes',
+  ss: 'Seconds'
+};
+
 function createDateParser(regexp, mapping) {
-  return function(iso) {
-    var parts, map;
+  return function(iso, date) {
+    var parts;
 
     if (isDate(iso)) {
       return iso;
@@ -1041,14 +1058,17 @@ function createDateParser(regexp, mapping) {
 
       if (parts) {
         parts.shift();
-        map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0 };
+        if (!date) {
+          date = new Date(1970, 0, 1, 0, 0, 0);
+        }
 
         forEach(parts, function(part, index) {
           if (index < mapping.length) {
-            map[mapping[index]] = +part;
+            date['set' + DATE_METHOD_MAPPING[mapping[index]]](+part - (mapping[index] === 'MM') || 0);
           }
         });
-        return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0);
+
+        return date;
       }
     }
 
@@ -1066,7 +1086,12 @@ function createDateInputType(type, regexp, parseDate, format) {
     ctrl.$parsers.push(function(value) {
       if (ctrl.$isEmpty(value)) return null;
       if (regexp.test(value)) {
-        var parsedDate = parseDate(value);
+        var previousDate = ctrl.$modelValue;
+        if (previousDate) {
+          var timezoneOffset = (timezone === 'UTC') ? (60000 * previousDate.getTimezoneOffset()) : 0;
+          previousDate = new Date(previousDate.getTime() + timezoneOffset);
+        }
+        var parsedDate = parseDate(value, previousDate);
         if (timezone === 'UTC') {
           parsedDate.setMinutes(parsedDate.getMinutes() - parsedDate.getTimezoneOffset());
         }

test/ng/directive/inputSpec.js

@@ -2062,6 +2062,17 @@ describe('input', function() {
       expect(scope.form.alias.$error.month).toBeTruthy();
     });
 
+    it('should only change the month of a bound date', function() {
+      compileInput('<input type="month" ng-model="value" ng-model-options="{timezone: \'UTC\'}" />');
+
+      scope.$apply(function() {
+        scope.value = new Date(Date.UTC(2013, 7, 1, 1, 0, 0));
+      });
+      changeInputValueTo('2013-12');
+      expect(+scope.value).toBe(Date.UTC(2013, 11, 1, 1, 0, 0));
+      expect(inputElm.val()).toBe('2013-12');
+    });
+
     describe('min', function (){
       beforeEach(function (){
         compileInput('<input type="month" ng-model="value" name="alias" min="2013-01" />');
@@ -2124,6 +2135,18 @@ describe('input', function() {
       expect(inputElm.val()).toBe('2013-W02');
     });
 
+    it('should not affect the hours or minutes of a bound date', function (){
+      compileInput('<input type="week" ng-model="secondWeek"/>');
+
+      scope.$apply(function(){
+        scope.secondWeek = new Date(2013, 0, 11, 1, 0, 0);
+      });
+
+      changeInputValueTo('2013-W03');
+
+      expect(+scope.secondWeek).toBe(+new Date(2013, 0, 17, 1, 0, 0));
+    });
+
     it('should set the model undefined if the input is an invalid week string', function () {
       compileInput('<input type="week" ng-model="value"/>');
 
@@ -2549,6 +2572,17 @@ describe('input', function() {
       expect(scope.form.alias.$error.time).toBeTruthy();
     });
 
+    it('should only change hours and minute of a bound date', function() {
+      compileInput('<input type="time" ng-model="value"" />');
+
+      scope.$apply(function(){
+        scope.value = new Date(2013, 2, 3, 1, 0, 0);
+      });
+
+      changeInputValueTo('01:02');
+      expect(+scope.value).toBe(+new Date(2013, 2, 3, 1, 2, 0));
+    });
+
     describe('min', function (){
       beforeEach(function (){
         compileInput('<input type="time" ng-model="value" name="alias" min="09:30:00" />');
@@ -2717,6 +2751,48 @@ describe('input', function() {
       expect(scope.form.alias.$error.date).toBeTruthy();
     });
 
+    it('should work with multiple date types bound to the same model', function() {
+      formElm = jqLite('<form name="form"></form>');
+
+      var timeElm = jqLite('<input type="time" ng-model="val" />'),
+          monthElm = jqLite('<input type="month" ng-model="val" />'),
+          weekElm = jqLite('<input type="week" ng-model="val" />');
+
+      formElm.append(timeElm);
+      formElm.append(monthElm);
+      formElm.append(weekElm);
+
+      $compile(formElm)(scope);
+
+      scope.$apply(function() {
+        scope.val = new Date(2013, 1, 2, 3, 4, 5);
+      });
+
+      expect(timeElm.val()).toBe('03:04:05');
+      expect(monthElm.val()).toBe('2013-02');
+      expect(weekElm.val()).toBe('2013-W05');
+
+      changeGivenInputTo(monthElm, '2012-02');
+      expect(monthElm.val()).toBe('2012-02');
+      expect(timeElm.val()).toBe('03:04:05');
+      expect(weekElm.val()).toBe('2012-W05');
+
+      changeGivenInputTo(timeElm, '04:05:06');
+      expect(monthElm.val()).toBe('2012-02');
+      expect(timeElm.val()).toBe('04:05:06');
+      expect(weekElm.val()).toBe('2012-W05');
+
+      changeGivenInputTo(weekElm, '2014-W01');
+      expect(monthElm.val()).toBe('2014-01');
+      expect(timeElm.val()).toBe('04:05:06');
+      expect(weekElm.val()).toBe('2014-W01');
+
+      function changeGivenInputTo(inputElm, value) {
+        inputElm.val(value);
+        browserTrigger(inputElm, $sniffer.hasEvent('input') ? 'input' : 'change');
+      }
+    });
+
     describe('min', function (){
       beforeEach(function (){
         compileInput('<input type="date" ng-model="value" name="alias" min="2000-01-01" />');