bugfixes

alenaksu · Mar 14, 2016 · b744cd1 · b744cd1
1 parent adb4ab1
commit b744cd1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/dist/mdPickers.js b/dist/mdPickers.js
@@ -381,10 +381,12 @@ module.directive("mdpDatePicker", ["$mdpDatePicker", "$timeout", function($mdpDa
             scope.autoSwitch = scope.autoSwitch || false;
 
             scope.getValue = function() {
-                var strVal = moment(ngModel.$modelValue).format(scope.dateFormat);
-                inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
-
-                return strVal;
+                if(angular.isDate(ngModel.$modelValue)) {
+                    var strVal = moment(ngModel.$modelValue).format(scope.dateFormat);
+                    inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
+
+                    return strVal;
+                 } else return "";
             };
 
             scope.$watch(function() { return ngModel.$error }, function(newValue, oldValue) {
@@ -727,10 +729,12 @@ module.directive("mdpTimePicker", ["$mdpTimePicker", "$timeout", function($mdpTi
             }, true);
 
             scope.getValue = function() {
-                var strVal = moment(ngModel.$modelValue).format(scope.timeFormat);
-                inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
-
-                return strVal;
+                if(angular.isDate(ngModel.$modelValue)) {
+                    var strVal = moment(ngModel.$modelValue).format(scope.timeFormat);
+                    inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
+
+                    return strVal;
+                 } else return "";
             };
 
             ngModel.$validators.format = function(modelValue, viewValue) {

diff --git a/dist/mdPickers.min.js b/dist/mdPickers.min.js
diff --git a/dist/mdPickers.min.js.map b/dist/mdPickers.min.js.map
diff --git a/src/components/mdpDatePicker/mdpDatePicker.js b/src/components/mdpDatePicker/mdpDatePicker.js
@@ -320,10 +320,12 @@ module.directive("mdpDatePicker", ["$mdpDatePicker", "$timeout", function($mdpDa
             scope.autoSwitch = scope.autoSwitch || false;
 
             scope.getValue = function() {
-                var strVal = moment(ngModel.$modelValue).format(scope.dateFormat);
-                inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
-
-                return strVal;
+                if(angular.isDate(ngModel.$modelValue)) {
+                    var strVal = moment(ngModel.$modelValue).format(scope.dateFormat);
+                    inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
+
+                    return strVal;
+                 } else return "";
             };
 
             scope.$watch(function() { return ngModel.$error }, function(newValue, oldValue) {

diff --git a/src/components/mdpTimePicker/mdpTimePicker.js b/src/components/mdpTimePicker/mdpTimePicker.js
@@ -280,10 +280,12 @@ module.directive("mdpTimePicker", ["$mdpTimePicker", "$timeout", function($mdpTi
             }, true);
 
             scope.getValue = function() {
-                var strVal = moment(ngModel.$modelValue).format(scope.timeFormat);
-                inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
-
-                return strVal;
+                if(angular.isDate(ngModel.$modelValue)) {
+                    var strVal = moment(ngModel.$modelValue).format(scope.timeFormat);
+                    inputContainerCtrl.setHasValue(!ngModel.$isEmpty(ngModel.$modelValue));
+
+                    return strVal;
+                 } else return "";
             };
 
             ngModel.$validators.format = function(modelValue, viewValue) {