fixes #874

Eonasdan · Mar 4, 2015 · b2a71de · b2a71de
1 parent d00e39d
commit b2a71de
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/build/css/bootstrap-datetimepicker.css b/build/css/bootstrap-datetimepicker.css
@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap 3
-//! version : 4.7.14
+ * ! version : 4.7.14
  * 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
@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap 3
-//! version : 4.7.14
+ * ! version : 4.7.14
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 .bootstrap-datetimepicker-widget {

diff --git a/build/js/bootstrap-datetimepicker.min.js b/build/js/bootstrap-datetimepicker.min.js
diff --git a/src/js/bootstrap-datetimepicker.js b/src/js/bootstrap-datetimepicker.js
@@ -473,12 +473,8 @@
                 if (options.disabledDates && isInDisabledDates(targetMoment) && granularity !== 'M') {
                     return false;
                 }
-                if (options.enabledDates) {
-                    if (isInEnabledDates(targetMoment)) {
-                        return true;
-                    } else {
-                        return false;
-                    }
+                if (options.enabledDates && isInEnabledDates(targetMoment) && granularity !== 'M') {
+                    return false;
                 }
                 if (options.minDate && targetMoment.isBefore(options.minDate, granularity)) {
                     return false;
@@ -1422,7 +1418,7 @@
                 setValue(options.maxDate);
             }
             if (viewDate.isAfter(parsedDate)) {
-                viewDate = parsedDate;
+                viewDate = parsedDate.clone();
             }
             update();
             return picker;
@@ -1458,7 +1454,7 @@
                 setValue(options.minDate);
             }
             if (viewDate.isBefore(parsedDate)) {
-                viewDate = parsedDate;
+                viewDate = parsedDate.clone();
             }
             update();
             return picker;

diff --git a/src/less/_bootstrap-datetimepicker.less b/src/less/_bootstrap-datetimepicker.less
@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap 3
-//! version : 4.7.14
+ * ! version : 4.7.14
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 @bs-datetimepicker-timepicker-font-size: 1.2em;