Default value

Default value not showing when just using timePicker
Gillardo · Mar 13, 2015 · 4a2be7c · 4a2be7c
1 parent 08481d7
commit 4a2be7c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-ui-datetime-picker",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "homepage": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
   "authors": [
     "Gillardo <[email protected]>"

diff --git a/datetime-picker.js b/datetime-picker.js
@@ -50,10 +50,10 @@
                     // popup element used to display calendar
                     var popupEl = angular.element('' +
                     '<div datetime-picker-popup>' +
-                        '<div ng-if="enableDate" collapse="!(showPicker == \'date\')" datepicker></div>' +
-                        '<div collapse="!(showPicker == \'time\')">' +
-                            '<div timepicker style="margin:0 auto"></div>' +
-                        '</div>' +
+                    '<div ng-if="enableDate" collapse="!(showPicker == \'date\')" datepicker></div>' +
+                    '<div collapse="!(showPicker == \'time\')">' +
+                    '<div timepicker style="margin:0 auto"></div>' +
+                    '</div>' +
                     '</div>');
 
                     // get attributes from directive
@@ -121,10 +121,12 @@
                             // with the time added on the end, and a dummy formatter
                             // and use this to see if the time is valid
                             if (scope.enableTime && !scope.enableDate) {
-                                var timeFormat = 'EEE MMM dd yyyy ' + dateFormat;
-                                var newTime = 'Fri Mar 12 2015 ' + viewValue;
+                                if (viewValue.length == dateFormat.length) {
+                                    var timeFormat = 'EEE MMM dd yyyy ' + dateFormat;
+                                    var newTime = 'Fri Mar 12 2015 ' + viewValue;
 
-                                date = dateParser.parse(newTime, timeFormat) || new Date(newTime);
+                                    date = dateParser.parse(newTime, timeFormat) || new Date(newTime);
+                                }
                             }
 
                             if (isNaN(date)) {

diff --git a/dist/datetime-picker.js b/dist/datetime-picker.js
@@ -1,5 +1,5 @@
 // https://github.com/Gillardo/bootstrap-ui-datetime-picker
-// Version: 1.0.9
+// Version: 1.0.10
 // Released: 2015-03-13 
 angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .directive('datetimePicker', ['$compile', '$parse', '$document', '$position', 'dateFilter', 'dateParser', 'datepickerPopupConfig',
@@ -53,10 +53,10 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                     // popup element used to display calendar
                     var popupEl = angular.element('' +
                     '<div datetime-picker-popup>' +
-                        '<div ng-if="enableDate" collapse="!(showPicker == \'date\')" datepicker></div>' +
-                        '<div collapse="!(showPicker == \'time\')">' +
-                            '<div timepicker style="margin:0 auto"></div>' +
-                        '</div>' +
+                    '<div ng-if="enableDate" collapse="!(showPicker == \'date\')" datepicker></div>' +
+                    '<div collapse="!(showPicker == \'time\')">' +
+                    '<div timepicker style="margin:0 auto"></div>' +
+                    '</div>' +
                     '</div>');
 
                     // get attributes from directive
@@ -124,10 +124,12 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                             // with the time added on the end, and a dummy formatter
                             // and use this to see if the time is valid
                             if (scope.enableTime && !scope.enableDate) {
-                                var timeFormat = 'EEE MMM dd yyyy ' + dateFormat;
-                                var newTime = 'Fri Mar 12 2015 ' + viewValue;
+                                if (viewValue.length == dateFormat.length) {
+                                    var timeFormat = 'EEE MMM dd yyyy ' + dateFormat;
+                                    var newTime = 'Fri Mar 12 2015 ' + viewValue;
 
-                                date = dateParser.parse(newTime, timeFormat) || new Date(newTime);
+                                    date = dateParser.parse(newTime, timeFormat) || new Date(newTime);
+                                }
                             }
 
                             if (isNaN(date)) {

diff --git a/dist/datetime-picker.min.js b/dist/datetime-picker.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-ui-datetime-picker",
   "url": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-angular-templates": "^0.5.7",