fix(datepicker): fix error w/ null date model value. Fixes #4232

angular · Aug 19, 2015 · bafbacb · bafbacb
1 parent e314072
commit bafbacb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/datepicker/calendar.js b/src/components/datepicker/calendar.js
@@ -355,7 +355,7 @@
    * @param {Date=} opt_date
    */
   CalendarCtrl.prototype.focus = function(opt_date) {
-    var date = opt_date || this.selectedDate;
+    var date = opt_date || this.selectedDate || this.today;
 
     var previousFocus = this.calendarElement.querySelector('.md-focus');
     if (previousFocus) {

diff --git a/src/components/datepicker/dateLocaleProvider.js b/src/components/datepicker/dateLocaleProvider.js
@@ -146,7 +146,7 @@
        * @returns {string}
        */
       function defaultFormatDate(date) {
-        return date.toLocaleDateString();
+        return date ? date.toLocaleDateString() : '';
       }
 
       /**