daterangepicker-4.x 4.4.3 → 4.4.4

package/README.md

@@ -18,8 +18,8 @@ Above samples are based on the [original repository](https://github.com/dangross
 ```html
 <script type="text/javascript" src="https://cdn.jsdelivr.net/jquery/latest/jquery.min.js"></script>
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/luxon@3.5.0/build/global/luxon.min.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.4.3/daterangepicker.min.js"></script>
-<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.4.3/daterangepicker.min.css" rel="stylesheet" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.4.4/daterangepicker.min.js"></script>
+<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.4.4/daterangepicker.min.css" rel="stylesheet" />
 
 <input type="text" id="daterange" />
 
@@ -565,7 +565,7 @@ Options for DateRangePicker
 | showISOWeekNumbers | <code>boolean</code> | <code>false</code> | Show **ISO** week numbers at the start of each week on the calendars.<br/> Takes precedence over localized `showWeekNumbers` |
 | timePicker | <code>boolean</code> | <code>false</code> | Adds select boxes to choose times in addition to dates |
 | timePicker24Hour | <code>boolean</code> | <code>true</code> | Use 24-hour instead of 12-hour times, removing the AM/PM selection |
-| timePickerStepSize | [<code>Duration</code>](https://moment.github.io/luxon/api-docs/index.html#duration) \| <code>string</code> \| <code>number</code> |  | Default: `Duration.fromObject({minutes:1})`<br/>Set the time picker step size.<br/> Must be a `luxon.Duration` or the number of seconds or a string according to [ISO-8601](ISO-8601) duration.<br/> Valid values are 1,2,3,4,5,6,10,12,15,20,30 for `Duration.fromObject({seconds: ...})` and `Duration.fromObject({minutes: ...})`  and 1,2,3,4,6,(8,12) for `Duration.fromObject({hours: ...})`.<br/> Duration must be greater than `minSpan` and smaller than `maxSpan`.<br/> For example `timePickerStepSize: 600` will disable time picker seconds and time picker minutes are set to step size of 10 Minutes.<br/> Overwrites `timePickerIncrement` and `timePickerSeconds` |
+| timePickerStepSize | [<code>Duration</code>](https://moment.github.io/luxon/api-docs/index.html#duration) \| <code>string</code> \| <code>number</code> |  | Default: `Duration.fromObject({minutes:1})`<br/>Set the time picker step size.<br/> Must be a `luxon.Duration` or the number of seconds or a string according to [ISO-8601](ISO-8601) duration.<br/> Valid values are 1,2,3,4,5,6,10,12,15,20,30 for `Duration.fromObject({seconds: ...})` and `Duration.fromObject({minutes: ...})`  and 1,2,3,4,6,(8,12) for `Duration.fromObject({hours: ...})`.<br/> Duration must be greater than `minSpan` and smaller than `maxSpan`.<br/> For example `timePickerStepSize: 600` will disable time picker seconds and time picker minutes are set to step size of 10 Minutes.<br/> Overwrites `timePickerIncrement` and `timePickerSeconds`, ignored when `timePicker: false` |
 | timePickerSeconds | <code>boolean</code> | <code>boolean</code> | **Deprecated**, use `timePickerStepSize`<br/>Show seconds in the timePicker |
 | timePickerIncrement | <code>boolean</code> | <code>1</code> | **Deprecated**, use `timePickerStepSize`<br/>Increment of the minutes selection list for times |
 | autoUpdateInput | <code>boolean</code> | <code>true</code> | Indicates whether the date range picker should instantly update the value of the attached `<input>`  element when the selected dates change.<br/>The `<input>` element will be always updated on `Apply` and reverted when user clicks on `Cancel`. |

package/daterangepicker.js

@@ -84,7 +84,7 @@
         * and 1,2,3,4,6,(8,12) for `Duration.fromObject({hours: ...})`.<br/>
         * Duration must be greater than `minSpan` and smaller than `maxSpan`.<br/>
         * For example `timePickerStepSize: 600` will disable time picker seconds and time picker minutes are set to step size of 10 Minutes.<br/>
-        * Overwrites `timePickerIncrement` and `timePickerSeconds`
+        * Overwrites `timePickerIncrement` and `timePickerSeconds`, ignored when `timePicker: false`
         * @property {boolean} timePickerSeconds=boolean - **Deprecated**, use `timePickerStepSize`<br/>Show seconds in the timePicker
         * @property {boolean} timePickerIncrement=1 - **Deprecated**, use `timePickerStepSize`<br/>Increment of the minutes selection list for times
         
@@ -379,46 +379,48 @@
             }
         }
 
-        if (typeof options.timePickerSeconds === 'boolean')  // backward compatibility            
-            this.timePickerStepSize = Duration.fromObject({ [options.timePickerSeconds ? 'seconds' : 'minutes']: 1 });
-        if (typeof options.timePickerIncrement === 'number')  // backward compatibility
-            this.timePickerStepSize = Duration.fromObject({ minutes: options.timePickerIncrement });
-
-        if (['string', 'object', 'number'].includes(typeof options.timePickerStepSize)) {
-            let duration;
-            if (options.timePickerStepSize instanceof Duration && options.timePickerStepSize.isValid) {
-                duration = options.timePickerStepSize;
-            } else if (Duration.fromISO(options.timePickerStepSize).isValid) {
-                duration = Duration.fromISO(options.timePickerStepSize);
-            } else if (typeof options.timePickerStepSize === 'number' && Duration.fromObject({ seconds: options.timePickerStepSize }).isValid) {
-                duration = Duration.fromObject({ seconds: options.timePickerStepSize });
-            } else {
-                console.error(`Option 'timePickerStepSize' is not valid`);
-                duration = this.timePickerStepSize;
-            };
-            var valid = [];
-            for (let unit of ['minutes', 'seconds'])
-                valid.push(...[1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30].map(x => { return Duration.fromObject({ [unit]: x }) }));
-            valid.push(...[1, 2, 3, 4, 6].map(x => { return Duration.fromObject({ hours: x }) }));
-            if (this.timePicker24Hour)
-                valid.push(...[8, 12].map(x => { return Duration.fromObject({ hours: x }) }));
-
-            if (valid.some(x => duration.rescale().equals(x))) {
-                this.timePickerStepSize = duration.rescale();
-            } else {
-                console.error(`Option 'timePickerStepSize' ${JSON.stringify(duration.toObject())} is not valid`);
+        if (this.timePicker) {
+            if (typeof options.timePickerSeconds === 'boolean')  // backward compatibility            
+                this.timePickerStepSize = Duration.fromObject({ [options.timePickerSeconds ? 'seconds' : 'minutes']: 1 });
+            if (typeof options.timePickerIncrement === 'number')  // backward compatibility
+                this.timePickerStepSize = Duration.fromObject({ minutes: options.timePickerIncrement });
+
+            if (['string', 'object', 'number'].includes(typeof options.timePickerStepSize)) {
+                let duration;
+                if (options.timePickerStepSize instanceof Duration && options.timePickerStepSize.isValid) {
+                    duration = options.timePickerStepSize;
+                } else if (Duration.fromISO(options.timePickerStepSize).isValid) {
+                    duration = Duration.fromISO(options.timePickerStepSize);
+                } else if (typeof options.timePickerStepSize === 'number' && Duration.fromObject({ seconds: options.timePickerStepSize }).isValid) {
+                    duration = Duration.fromObject({ seconds: options.timePickerStepSize });
+                } else {
+                    console.error(`Option 'timePickerStepSize' is not valid`);
+                    duration = this.timePickerStepSize;
+                };
+                var valid = [];
+                for (let unit of ['minutes', 'seconds'])
+                    valid.push(...[1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30].map(x => { return Duration.fromObject({ [unit]: x }) }));
+                valid.push(...[1, 2, 3, 4, 6].map(x => { return Duration.fromObject({ hours: x }) }));
+                if (this.timePicker24Hour)
+                    valid.push(...[8, 12].map(x => { return Duration.fromObject({ hours: x }) }));
+
+                if (valid.some(x => duration.rescale().equals(x))) {
+                    this.timePickerStepSize = duration.rescale();
+                } else {
+                    console.error(`Option 'timePickerStepSize' ${JSON.stringify(duration.toObject())} is not valid`);
+                }
             }
+            if (this.maxSpan && this.timePickerStepSize > this.maxSpan)
+                console.error(`Option 'timePickerStepSize' ${JSON.stringify(this.timePickerStepSize.toObject())} must be smaller than 'maxSpan'`);
+
+            this.timePickerOpts = {
+                showMinutes: this.timePickerStepSize < Duration.fromObject({ hours: 1 }),
+                showSeconds: this.timePickerStepSize < Duration.fromObject({ minutes: 1 }),
+                hourStep: this.timePickerStepSize >= Duration.fromObject({ hours: 1 }) ? this.timePickerStepSize.hours : 1,
+                minuteStep: this.timePickerStepSize >= Duration.fromObject({ minutes: 1 }) ? this.timePickerStepSize.minutes : 1,
+                secondStep: this.timePickerStepSize.seconds
+            };
         }
-        if (this.timePicker && this.maxSpan && this.timePickerStepSize > this.maxSpan)
-            console.error(`Option 'timePickerStepSize' ${JSON.stringify(this.timePickerStepSize.toObject())} must be smaller than 'maxSpan'`);
-
-        this.timePickerOpts = {
-            showMinutes: this.timePickerStepSize < Duration.fromObject({ hours: 1 }),
-            showSeconds: this.timePickerStepSize < Duration.fromObject({ minutes: 1 }),
-            hourStep: this.timePickerStepSize >= Duration.fromObject({ hours: 1 }) ? this.timePickerStepSize.hours : 1,
-            minuteStep: this.timePickerStepSize >= Duration.fromObject({ minutes: 1 }) ? this.timePickerStepSize.minutes : 1,
-            secondStep: this.timePickerStepSize.seconds
-        };
 
         for (let opt of ['startDate', 'endDate', 'minDate', 'maxDate', 'initalMonth']) {
             if (opt == 'endDate' && this.singleDatePicker)
@@ -2158,10 +2160,12 @@
             var i = 0;
             for (var range in this.ranges) {
                 var unit = this.timePicker ? 'hour' : 'day';
-                if (this.timePickerOpts.showMinutes) {
-                    unit = 'minute';
-                } else if (this.timePickerOpts.showSeconds) {
-                    unit = 'second';
+                if (this.timePicker) {
+                    if (this.timePickerOpts.showMinutes) {
+                        unit = 'minute';
+                    } else if (this.timePickerOpts.showSeconds) {
+                        unit = 'second';
+                    }
                 }
                 if (this.startDate.startOf(unit) == this.ranges[range][0].startOf(unit) == this.endDate.startOf(unit) == this.ranges[range][1].startOf(unit)) {
                     customRange = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daterangepicker-4.x",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "description": "Date range picker with time component and pre-defined ranges",
   "main": "daterangepicker.js",
   "style": "daterangepicker.css",