Updating the model should result in an updated datepicker

Conflicts: test/date.spec.js
angular-ui · timmipetit · May 8, 2014 · May 8, 2014 · b13217e8f9ed62bfb283353d9b29d517f7a8e9fa
commit b13217e8f9ed62bfb283353d9b29d517f7a8e9fa
diff --git a/demo/demo.html b/demo/demo.html
@@ -17,5 +17,6 @@
 <body ng-app="ui.date">
   <label>Select Date: <input type="text" ui-date ng-model="aDate"></label>
   <div>{{aDate}}</div>
+  <div><a href="" ng-click="aDate.setDate(aDate.getDate()+1);">Increase Date</a></div>
 </body>
 </html>
diff --git a/src/date.js b/src/date.js
@@ -62,6 +62,14 @@ angular.module('ui.date', [])
             }
             element.datepicker("setDate", date);
           };
+
+          scope.$watch(attrs.ngModel, function() {
+            var date = controller.$viewValue;
+            if ( angular.isDefined(date) && date !== null && !angular.isDate(date) ) {
+              return;
+            }
+            controller.$render();
+          }, true);
         }
         // If we don't destroy the old one it doesn't update properly when the config changes
         element.datepicker('destroy');

diff --git a/test/date.spec.js b/test/date.spec.js
@@ -26,6 +26,19 @@ describe('uiDate', function() {
         expect(element.datepicker('getDate')).toEqual(aDate);
       });
     });
+    it('should update the datepicker if the model changes', function() {
+      inject(function($compile, $rootScope) {
+        var aDate, element;
+        aDate = new Date(2010, 12, 1);
+        element = $compile("<input ui-date ng-model='x'/>")($rootScope);
+        $rootScope.$apply(function() {
+          $rootScope.x = aDate;
+        });
+        aDate.setDate(aDate.getDate()+1);
+        $rootScope.$apply();
+        expect(element.datepicker('getDate')).toEqual(aDate);
+      });
+    });
     it('should put the date in the model', function() {
       inject(function($compile, $rootScope) {
         var aDate, element;