hotfix for Eonasdan#140 and Eonasdan#151

README.md

@@ -117,6 +117,11 @@ Finally include the main javascript file.
 
 # Change Log
 
+## 2.1.32 (Hotfix)
+
+* Fix for #151: When a bad date value or the picker is cleared, the plugin will not longer attempt to reset it back to the previous date
+* Fix for #140: `setDate` can be given `null` to force clear the picker
+
 ## 2.1.30
 #### Important! `build.less` file name has been been changed to `bootstrap-datetimepicker-build.less` to prevent collisions
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "eonasdan-bootstrap-datetimepicker",
-  "version": "2.2.20",
+  "version": "2.2.22",
   "main": [
     "build/css/bootstrap-datetimepicker.min.css",
     "build/js/bootstrap-datetimepicker.min.js"

component.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-datetimepicker",
-  "version": "2.1.30",
+  "version": "2.1.32",
   "main": ["build/css/bootstrap-datetimepicker.min.css","build/js/bootstrap-datetimepicker.min.js"],
   "dependencies": {
     "jquery" : ">=1.8.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-datetimepicker",
-  "version": "2.1.30",
+  "version": "2.1.32",
   "repository": {
     "type": "git",
     "url": "git://github.com/eonasdan/bootstrap-datetimepicker.git"

src/js/bootstrap-datetimepicker.js

@@ -1,5 +1,5 @@
 /**
- * version 2.1.30
+ * version 2.1.32
  * @license
  * =========================================================
  * bootstrap-datetimepicker.js
@@ -62,7 +62,7 @@
             startDate: new pMoment({ y: 1970 }),
             endDate: new pMoment().add(50, "y"),
             collapse: true,
-            language: pMoment.lang(),
+            language: "en",
             defaultDate: "",
             disabledDates: [],
             enabledDates: false,
@@ -668,8 +668,6 @@
             }
             else {
                 picker.viewDate = oldDate;
-                input.val(pMoment(oldDate).format(picker.format));
-                //picker.setValue(""); // unset the date when the input is erased
                 notifyChange(oldDate, e.type);
                 notifyError(newDate);
                 picker.unset = true;
@@ -1032,6 +1030,7 @@
             pMoment.lang(picker.options.language);
             if (!newDate) {
                 picker.unset = true;
+                 set();
             } else {
                 picker.unset = false;
             }
@@ -1054,9 +1053,11 @@
         },
 
         picker.setDate = function (date) {
-            date = pMoment(date);
-            if (!date) picker.setValue(null);
-            else picker.setValue(date);
+            if (!date) {
+                picker.setValue(null);
+            } else {
+                picker.setValue(pMoment(date));
+            }
         },
 
         picker.setEnabledDates = function (dates) {