Merge pull request #453 from Eonasdan/development

fix for issue #451
Eonasdan · Aug 4, 2014 · 88bb292 · 88bb292
2 parents 428846c + 9aa2ca8
commit 88bb292
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "eonasdan-bootstrap-datetimepicker",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "main": [
     "build/css/bootstrap-datetimepicker.min.css",
     "build/js/bootstrap-datetimepicker.min.js"

diff --git a/build/css/bootstrap-datetimepicker.css b/build/css/bootstrap-datetimepicker.css
@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap v3
-//! version : 3.0.1
+//! version : 3.0.2
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 .bootstrap-datetimepicker-widget {

diff --git a/build/css/bootstrap-datetimepicker.min.css b/build/css/bootstrap-datetimepicker.min.css
diff --git a/build/js/bootstrap-datetimepicker.min.js b/build/js/bootstrap-datetimepicker.min.js
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-datetimepicker",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "main": ["build/css/bootstrap-datetimepicker.min.css","build/js/bootstrap-datetimepicker.min.js"],
   "dependencies": {
     "jquery" : ">=1.8.3",

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "eonasdan/bootstrap-datetimepicker",
   "type": "component",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Date/time picker widget based on twitter bootstrap",
   "keywords": [
     "bootstrap",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-datetimepicker",
   "filename": "js/bootstrap-datetimepicker.min.js",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/eonasdan/bootstrap-datetimepicker.git"

diff --git a/src/js/bootstrap-datetimepicker.js b/src/js/bootstrap-datetimepicker.js
@@ -1,5 +1,5 @@
 /*
-//! version : 3.0.1
+//! version : 3.0.2
 =========================================================
 bootstrap-datetimepicker.js
 https://github.com/Eonasdan/bootstrap-datetimepicker
@@ -69,7 +69,7 @@ THE SOFTWARE.
         dDate,
 
         init = function () {
-            var icon = false, longDateFormat, rInterval;
+            var icon = false, localeData, rInterval;
             picker.options = $.extend({}, defaults, options);
             picker.options.icons = $.extend({}, icons, picker.options.icons);
 
@@ -98,16 +98,16 @@ THE SOFTWARE.
             }
             picker.format = picker.options.format;
 
-            longDateFormat = pMoment().localeData().longDateFormat;
+            localeData = pMoment().localeData();
 
             if (!picker.format) {
-                picker.format = (picker.options.pickDate ? longDateFormat('L') : '');
+                picker.format = (picker.options.pickDate ? localeData.longDateFormat('L') : '');
                 if (picker.options.pickDate && picker.options.pickTime) {
                     picker.format += ' ';
                 }
-                picker.format += (picker.options.pickTime ? longDateFormat('LT') : '');
+                picker.format += (picker.options.pickTime ? localeData.longDateFormat('LT') : '');
                 if (picker.options.useSeconds) {
-                    if (longDateFormat('LT').indexOf(' A') !== -1) {
+                    if (localeData.longDateFormat('LT').indexOf(' A') !== -1) {
                         picker.format = picker.format.split(' A')[0] + ':ss A';
                     }
                     else {

diff --git a/src/less/bootstrap-datetimepicker.less b/src/less/bootstrap-datetimepicker.less
@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap v3
-//! version : 3.0.1
+//! version : 3.0.2
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 .bootstrap-datetimepicker-widget {