Issue #17

Pressing Clear when using date and time, after intial value is selected, threw error.
Gillardo · Apr 22, 2015 · b8fb05f · b8fb05f
1 parent 0f5ae55
commit b8fb05f
Show file tree

Hide file tree

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

diff --git a/datetime-picker.js b/datetime-picker.js
@@ -158,9 +158,9 @@
                         // we will use, if its the timePicker but enableDate = true, we need to merge
                         // the values, else timePicker will reset the date
                         if (scope.enableDate && scope.enableTime && scope.showPicker === 'time') {
-                            if (currentDate && currentDate !== null && (scope.date !== null || dt)) {
+                            if (currentDate && currentDate !== null && (scope.date !== null || dt || dt != null)) {
                                 // dt will not be undefined if the now or today button is pressed
-                                if (angular.isDefined(dt)) {
+                                if (dt && dt != null) {
                                     currentDate.setHours(dt.getHours());
                                     currentDate.setMinutes(dt.getMinutes());
                                     currentDate.setSeconds(dt.getSeconds());

diff --git a/dist/datetime-picker.js b/dist/datetime-picker.js
@@ -1,6 +1,6 @@
 // https://github.com/Gillardo/bootstrap-ui-datetime-picker
-// Version: 1.0.18
-// Released: 2015-04-10 
+// Version: 1.0.19
+// Released: 2015-04-22 
 angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .directive('datetimePicker', ['$compile', '$parse', '$document', '$timeout', '$position', 'dateFilter', 'dateParser', 'datepickerPopupConfig',
         function ($compile, $parse, $document, $timeout, $position, dateFilter, dateParser, datepickerPopupConfig) {
@@ -161,9 +161,9 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                         // we will use, if its the timePicker but enableDate = true, we need to merge
                         // the values, else timePicker will reset the date
                         if (scope.enableDate && scope.enableTime && scope.showPicker === 'time') {
-                            if (currentDate && currentDate !== null && (scope.date !== null || dt)) {
+                            if (currentDate && currentDate !== null && (scope.date !== null || dt || dt != null)) {
                                 // dt will not be undefined if the now or today button is pressed
-                                if (angular.isDefined(dt)) {
+                                if (dt && dt != null) {
                                     currentDate.setHours(dt.getHours());
                                     currentDate.setMinutes(dt.getMinutes());
                                     currentDate.setSeconds(dt.getSeconds());

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.18",
+  "version": "1.0.19",
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-angular-templates": "^0.5.7",