Merge pull request #62 from szkrd/master

chore(dependency): angular-ui-bootstrap 0.14.3 requires the "uib" pre…
Gillardo · Nov 2, 2015 · 5001b88 · 5001b88
2 parents 6f6daa4 + 345a3a2
commit 5001b88
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/datetime-picker.js b/datetime-picker.js
@@ -18,7 +18,7 @@
         appendToBody: false,
         showButtonBar: true
     })
-    .directive('datetimePicker', ['$compile', '$parse', '$document', '$timeout', '$position', 'dateFilter', 'dateParser', 'uiDatetimePickerConfig', '$rootScope',
+    .directive('datetimePicker', ['$compile', '$parse', '$document', '$timeout', '$uibPosition', 'dateFilter', 'uibDateParser', 'uiDatetimePickerConfig', '$rootScope',
         function ($compile, $parse, $document, $timeout, $position, dateFilter, dateParser, uiDatetimePickerConfig, $rootScope) {
             return {
                 restrict: 'A',
@@ -77,10 +77,10 @@
                     // popup element used to display calendar
                     var popupEl = angular.element('' +
                         '<div date-picker-wrap>' +
-                        '<div datepicker></div>' +
+                        '<div uib-datepicker></div>' +
                         '</div>' +
                         '<div time-picker-wrap>' +
-                        '<div timepicker style="margin:0 auto"></div>' +
+                        '<div uib-timepicker style="margin:0 auto"></div>' +
                         '</div>');
 
                     // get attributes from directive

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.2.6
-// Released: 2015-10-21 
+// Version: 1.2.7
+// Released: 2015-10-26 
 angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .constant('uiDatetimePickerConfig', {
         dateFormat: 'yyyy-MM-dd HH:mm',
@@ -21,7 +21,7 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
         appendToBody: false,
         showButtonBar: true
     })
-    .directive('datetimePicker', ['$compile', '$parse', '$document', '$timeout', '$position', 'dateFilter', 'dateParser', 'uiDatetimePickerConfig', '$rootScope',
+    .directive('datetimePicker', ['$compile', '$parse', '$document', '$timeout', '$uibPosition', 'dateFilter', 'uibDateParser', 'uiDatetimePickerConfig', '$rootScope',
         function ($compile, $parse, $document, $timeout, $position, dateFilter, dateParser, uiDatetimePickerConfig, $rootScope) {
             return {
                 restrict: 'A',
@@ -80,10 +80,10 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                     // popup element used to display calendar
                     var popupEl = angular.element('' +
                         '<div date-picker-wrap>' +
-                        '<div datepicker></div>' +
+                        '<div uib-datepicker></div>' +
                         '</div>' +
                         '<div time-picker-wrap>' +
-                        '<div timepicker style="margin:0 auto"></div>' +
+                        '<div uib-timepicker style="margin:0 auto"></div>' +
                         '</div>');
 
                     // get attributes from directive
@@ -345,8 +345,10 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                     scope.isDisabled = function(date) {
                         var isToday = (date == 'today');
 
-                        if (date === 'today' || date === 'now')
+                        if (date === 'today' || date === 'now') {
                             date = new Date();
+                            date.setHours(0, 0, 0, 0);
+                        }
 
                         if (attrs.dateDisabled) {
                             return scope.dateDisabled({date: date, mode: scope.watchData['datepickerMode']});

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