Updates

Added module.exports to dist Fixed #166
Gillardo · Jan 19, 2017 · 50e4eda · lucasgranberg · Jan 19, 2017 · 50e4eda
1 parent ecc3e5b
commit 50e4eda
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -81,52 +81,58 @@ Now datetimePicker options are globally set by default.  If you do not state the
 
 ```
 .constant('uiDatetimePickerConfig', {
-        dateFormat: 'yyyy-MM-dd HH:mm',
-        defaultTime: '00:00:00',
-        html5Types: {
-            date: 'yyyy-MM-dd',
-            'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
-            'month': 'yyyy-MM'
+    dateFormat: 'yyyy-MM-dd HH:mm',
+    defaultTime: '00:00:00',
+    html5Types: {
+        date: 'yyyy-MM-dd',
+        'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+        'month': 'yyyy-MM'
+    },
+    initialPicker: 'date',
+    reOpenDefault: false,
+    enableDate: true,
+    enableTime: true,
+    buttonBar: {
+        show: true,
+        now: {
+            show: true,
+            text: 'Now',
+            cls: 'btn-sm btn-default'
+        },
+        today: {
+            show: true,
+            text: 'Today',
+            cls: 'btn-sm btn-default'
+        },
+        clear: {
+            show: true,
+            text: 'Clear',
+            cls: 'btn-sm btn-default'
+        },
+        date: {
+            show: true,
+            text: 'Date',
+            cls: 'btn-sm btn-default'
         },
-        initialPicker: 'date',
-        reOpenDefault: false,
-        enableDate: true,
-        enableTime: true,
-        buttonBar: {
+        time: {
             show: true,
-            now: {
-                show: true,
-                text: 'Now'
-            },
-            today: {
-                show: true,
-                text: 'Today'
-            },
-            clear: {
-                show: true,
-                text: 'Clear'
-            },
-            date: {
-                show: true,
-                text: 'Date'
-            },
-            time: {
-                show: true,
-                text: 'Time'
-            },
-            close: {
-                show: true,
-                text: 'Close'
-            }
+            text: 'Time',
+            cls: 'btn-sm btn-default'
         },
-        closeOnDateSelection: true,
-        closeOnTimeNow: true,
-        appendToBody: false,
-        altInputFormats: [],
-        ngModelOptions: { },
-        saveAs: false,
-        readAs: false,
-    })
+        close: {
+            show: true,
+            text: 'Close',
+            cls: 'btn-sm btn-default'
+        }
+    },
+    closeOnDateSelection: true,
+    closeOnTimeNow: true,
+    appendToBody: false,
+    altInputFormats: [],
+    ngModelOptions: {},
+    saveAs: false,
+    readAs: false
+})
 ```
 
 ## Css
@@ -146,7 +152,7 @@ Applied when the date picker is visible
 ```
 .datetime-picker-dropdown > li.time-picker-menu
 ```
-Applied when the time picker is visible
+Applied when the time picker is visible.  The buttons in the buttonBars can be overridden by setting the css classes as stated above
 
 ###### EXAMPLE
 For example, if i add this css code, you will see the difference to the calendar in the images below

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-ui-datetime-picker",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "homepage": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
   "authors": [
     "Gillardo <[email protected]>"

diff --git a/datetime-picker.js b/datetime-picker.js
@@ -289,8 +289,14 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
 
             $scope.keydown = function (evt) {
                 if (evt.which === 27) {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+
                     $scope.close(false);
-                    $element[0].focus();
+
+                    $timeout(function(){
+                        $element[0].focus();
+                    }, 0);
                 }
             };
 
@@ -661,4 +667,4 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
             transclude: true,
             templateUrl: 'template/time-picker.html'
         };
-    });
+    });
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: 2.5.0
-// Released: 2017-01-12 
+// Version: 2.5.1
+// Released: 2017-01-19 
 angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
     .constant('uiDatetimePickerConfig', {
         dateFormat: 'yyyy-MM-dd HH:mm',
@@ -292,8 +292,14 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
 
             $scope.keydown = function (evt) {
                 if (evt.which === 27) {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+
                     $scope.close(false);
-                    $element[0].focus();
+
+                    $timeout(function(){
+                        $element[0].focus();
+                    }, 0);
                 }
             };
 
@@ -665,7 +671,6 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
             templateUrl: 'template/time-picker.html'
         };
     });
-
 angular.module('ui.bootstrap.datetimepicker').run(['$templateCache', function($templateCache) {
   'use strict';
 
@@ -679,3 +684,5 @@ angular.module('ui.bootstrap.datetimepicker').run(['$templateCache', function($t
   );
 
 }]);
+
+module.exports = 'ui.bootstrap.datetimepicker';
diff --git a/dist/datetime-picker.min.js b/dist/datetime-picker.min.js
diff --git a/gruntfile.js b/gruntfile.js
@@ -8,7 +8,7 @@ module.exports = function (grunt) {
         ngtemplates: {
             app: {
                 src: [
-                    'template/*.html',
+                    'template/*.html'
                 ],
                 dest: 'dist/datetime-picker.tpls.js',
                 options: {
@@ -33,7 +33,8 @@ module.exports = function (grunt) {
             app: {
                 src: [
                     'datetime-picker.js',
-                    '<%= ngtemplates.app.dest %>'
+                    '<%= ngtemplates.app.dest %>',
+                    'module-export.js'
                 ],
                 dest: 'dist/datetime-picker.js'
             }

diff --git a/module-export.js b/module-export.js
@@ -0,0 +1 @@
+module.exports = 'ui.bootstrap.datetimepicker';
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-ui-datetime-picker",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "url": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
   "authors": [
     "Gillardo <[email protected]>"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = 'ui.bootstrap.datetimepicker';
This comment has been minimized. Sign in to view Copy link lucasgranberg Jan 19, 2017 • edited Loading This breaks my application. "Uncaught ReferenceError: module is not defined at datetime-picker.js:688"