Fixed #111

Gillardo · Apr 7, 2016 · 865d676 · 865d676
1 parent d42cee0
commit 865d676
Show file tree

Hide file tree

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

diff --git a/datetime-picker.js b/datetime-picker.js
@@ -370,9 +370,6 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                 }
 
                 $scope.dateSelection(date);
-
-                if (opt == 'clear')
-                    $scope.close();
             };
 
             $scope.open = function (picker, evt) {
@@ -388,9 +385,11 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
 
                 // in order to update the timePicker, we need to update the model reference!
                 // as found here https://angular-ui.github.io/bootstrap/#/timepicker
-                $timeout(function() {
-                    $scope.date = new Date($scope.date);
-                }, 50);
+                if (picker == 'time') {
+                    $timeout(function() {
+                        $scope.date = parseDateString(ngModel.$viewValue);
+                    }, 50);
+                }
             };
 
             $scope.close = function (closePressed) {

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: 2.3.0
+// Version: 2.3.1
 // Released: 2016-04-07 
 angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .constant('uiDatetimePickerConfig', {
@@ -373,9 +373,6 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                 }
 
                 $scope.dateSelection(date);
-
-                if (opt == 'clear')
-                    $scope.close();
             };
 
             $scope.open = function (picker, evt) {
@@ -391,9 +388,11 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
 
                 // in order to update the timePicker, we need to update the model reference!
                 // as found here https://angular-ui.github.io/bootstrap/#/timepicker
-                $timeout(function() {
-                    $scope.date = new Date($scope.date);
-                }, 50);
+                if (picker == 'time') {
+                    $timeout(function() {
+                        $scope.date = parseDateString(ngModel.$viewValue);
+                    }, 50);
+                }
             };
 
             $scope.close = function (closePressed) {