Issue #9

bug fix
Gillardo · Mar 23, 2015 · 0fc8304 · 0fc8304
1 parent 668c753
commit 0fc8304
Show file tree

Hide file tree

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

diff --git a/datetime-picker.js b/datetime-picker.js
@@ -165,12 +165,13 @@
                             }
                         }
 
-                        // store currentDate
-                        currentDate = scope.date;
-
                         if (angular.isDefined(dt)) {
                             scope.date = dt;
                         }
+
+                        // store currentDate
+                        currentDate = scope.date;
+
                         ngModel.$setViewValue(scope.date);
                         ngModel.$render();
 

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.11
+// Version: 1.0.12
 // Released: 2015-03-23 
 angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .directive('datetimePicker', ['$compile', '$parse', '$document', '$timeout', '$position', 'dateFilter', 'dateParser', 'datepickerPopupConfig',
@@ -168,12 +168,13 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                             }
                         }
 
-                        // store currentDate
-                        currentDate = scope.date;
-
                         if (angular.isDefined(dt)) {
                             scope.date = dt;
                         }
+
+                        // store currentDate
+                        currentDate = scope.date;
+
                         ngModel.$setViewValue(scope.date);
                         ngModel.$render();
 

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