X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2Fcrm.datepicker.js;h=19a40e98af640fd7d3e6138c9aa6381b99f79fa2;hb=c66054d28435f089215f8f6a1e581312fc31cbbe;hp=d630834c5c0b4c4efce4132d1b10fa8bb4611e07;hpb=752d4ee65c8d76843aa046e73979eb4013d916a7;p=civicrm-core.git

diff --git a/js/crm.datepicker.js b/js/crm.datepicker.js
index d630834c5c..19a40e98af 100644
--- a/js/crm.datepicker.js
+++ b/js/crm.datepicker.js
@@ -44,6 +44,7 @@
           .change(updateDataField)
           .timeEntry({
             spinnerImage: '',
+            useMouseWheel: false,
             show24Hours: settings.time === true || settings.time === undefined ? CRM.config.timeIs24Hr : settings.time == '24'
           });
         if (!placeholder) {
@@ -56,10 +57,10 @@
         CRM.utils.copyAttributes($dataField, $dateField, ['style', 'class', 'disabled', 'aria-label']);
         placeholder = settings.placeholder || $dataField.attr('placeholder');
         $dateField.addClass('crm-form-' + type);
-        if (!settings.minDate && !_.isUndefined(settings.start_date_years)) {
+        if (!settings.minDate && isInt(settings.start_date_years)) {
           settings.minDate = '' + (new Date().getFullYear() - settings.start_date_years) + '-01-01';
         }
-        if (!settings.maxDate && !_.isUndefined(settings.end_date_years)) {
+        if (!settings.maxDate && isInt(settings.end_date_years)) {
           settings.maxDate = '' + (new Date().getFullYear() + settings.end_date_years) + '-12-31';
         }
         if (hasDatepicker) {
@@ -105,10 +106,7 @@
        */
       function dateHasDay() {
         var lowerFormat = settings.dateFormat.toLowerCase();
-        if (lowerFormat.indexOf('d') < 0) {
-          return false;
-        }
-        return true;
+        return lowerFormat.indexOf('d') >= 0;
       }
       function updateInputFields(e, context) {
         var val = $dataField.val(),
@@ -159,4 +157,13 @@
       updateInputFields();
     });
   };
+
+  function isInt(value) {
+    if (isNaN(value)) {
+      return false;
+    }
+    var x = parseFloat(value);
+    return (x | 0) === x;
+  }
+
 })(jQuery, CRM, CRM._);