daterangepicker-4.x 4.1.6 → 4.1.7

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@latest/daterangepicker.min.js"></script>
-<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@latest/daterangepicker.min.css" rel="stylesheet" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.1.7/daterangepicker.min.js"></script>
+<link type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker-4.x@4.1.7/daterangepicker.min.css" rel="stylesheet" />
 
 <input type="text" id="daterange" />
 
@@ -100,18 +100,21 @@ isInvalidDate: function(date) {
 }
 ```
 ### Features
-Compared to [inital repository](https://github.com/dangrossman/daterangepicker), this fork added following features:
+Compared to [inital repository](https://github.com/dangrossman/daterangepicker), this fork added following features and changes:
 
+- Replaced [moment](https://momentjs.com/) by [luxon](https://moment.github.io/luxon/index.html) (see differences below)
 - Added CSS class `weekend-day` for weekend days in calendar 
 - Added option `timePickerStepSize` to succeed options `timePickerIncrement` and `timePickerSeconds`
-- Added events for `dateChange.daterangepicker` and `timeChange.daterangepicker`
-- Added method `setRange` to combine `setStartDate` and `setEndDate`
+- Added events `dateChange.daterangepicker` and `timeChange.daterangepicker` emitted when user clicks on a date/time
+- Added event `beforeHide.daterangepicker` enables you to keep the picker visible after click on `Apply` or `Cancel` button.
+- Added method `setRange(startDate, endDate)` to combine `setStartDate(startDate)` and `setEndDate(endDate)`
 - Added option `minSpan` similar to `maxSpan`
 - Added option `isInvalidTime` similar to `isInvalidDate`
 - Added option `onOutsideClick` where you can define whether picker shall apply or revert selected value
-- Replaced [moment](https://momentjs.com/) by [luxon](https://moment.github.io/luxon/index.html)
-- Better validation of input parameters, error are logged to console
+- Better validation of input parameters, errors are logged to console
 - Highlight range in calendar when hovering over pre-defined ranges
+- Option `autoUpdateInput` defines whether the attached `<input>` element is updated when the user clicks on a date value.<br/>
+In original daterangepicker this parameter defines whether the `<input>` is updated when the user clicks on `Apply` button.
 - Added option `locale.durationFormat` to show customized label for selected duration, e.g. `'4 Days, 6 Hours, 30 Minutes'` 
 - ... and maybe some new bugs 😉 
 
@@ -127,7 +130,7 @@ This table lists a few important differences between datarangepicker using momen
 | from ISO-8601 String    | `moment(...)`                                       | `DateIme.fromISO(...)`         | 
 | from [Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date) Object | `moment(...)` | `DateIme.fromJSDate(...)`         | 
 | current day             | `moment()`                                          | `DateTime.now()`  |
-| format to string        | `format(...)``                                      | `toFormat(...)`   |
+| format to string        | `format(...)`                                      | `toFormat(...)`   |
 | format tokens           | `'YYYY-MM-DD'`                                      | `'yyyy-MM-dd'`    |
 
 
@@ -485,7 +488,7 @@ Options for DateRangePicker
 | timePickerStepSize | [<code>Duration</code>](https://moment.github.io/luxon/api-docs/index.html#duration) \| <code>string</code> |  | Default: `Duration.fromObject({minutes:1})`<br/>Set the time picker step size.<br/> Must be a `luxon.Duration` or 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 |
 | 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 automatically update the value of the `<input>`  element it's attached to at initialization and when the selected dates change.<br/>Value is reverted when use clicks on `Cancel`. |
+| 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`. |
 | onOutsideClick | <code>string</code> | <code>&quot;none&quot;</code> | Defines what picker shall do when user clicks outside the calendar.  `'apply'` or `'cancel'`. Event [onOutsideClick.daterangepicker](#event_outsideClick.daterangepicker) is always emitted. |
 | linkedCalendars | <code>boolean</code> | <code>true</code> | When enabled, the two calendars displayed will always be for two sequential months (i.e. January and February),  and both will be advanced when clicking the left or right arrows above the calendars.<br/> When disabled, the two calendars can be individually advanced and display any month/year |
 | isInvalidDate | <code>function</code> | <code>false</code> | A function that is passed each date in the two calendars before they are displayed,<br/>  and may return `true` or `false` to indicate whether that date should be available for selection or not.<br/> Signature: `isInvalidDate(date)` Function has no effect on date values set by `startDate`, `endDate`, `ranges`, [setStartDate](#DateRangePicker+setStartDate), [setEndDate](#DateRangePicker+setEndDate). |

package/daterangepicker.js

@@ -83,8 +83,8 @@
         * @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
         
-        * @property {boolean} autoUpdateInput=true - Indicates whether the date range picker should automatically update the value of the `<input>` 
-        * element it's attached to at initialization and when the selected dates change.<br/>Value is reverted when use clicks on `Cancel`.
+        * @property {boolean} autoUpdateInput=true - 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`.
         * @property {string} onOutsideClick=none - Defines what picker shall do when user clicks outside the calendar. 
         * `'apply'` or `'cancel'`. Event {@link #event_outsideClick.daterangepicker|onOutsideClick.daterangepicker} is always emitted.
         * @property {boolean} linkedCalendars=true - When enabled, the two calendars displayed will always be for two sequential months (i.e. January and February), 
@@ -1158,11 +1158,13 @@
                 }
                 calendar[row][col] = theDate.set(time);
 
-                if (this.minDate && calendar[row][col].hasSame(this.minDate, 'month') && calendar[row][col] < this.minDate && side == 'left')
+                // I have no clue why and how this shall be used in original code. Skip it, maybe I will find out later
+                /*if (this.minDate && calendar[row][col].hasSame(this.minDate, 'month') && calendar[row][col] < this.minDate && side == 'left')
                     calendar[row][col] = this.minDate;
 
                 if (this.maxDate && calendar[row][col].hasSame(this.maxDate, 'month') && calendar[row][col] > this.maxDate && side == 'right')
                     calendar[row][col] = this.maxDate;
+                */
             }
 
             //make the calendar object available to hoverDate/clickDate
@@ -1324,7 +1326,7 @@
                     if (!classes.includes('disabled'))
                         classes.push('available');
 
-                    html += `<td class="${classes.join(' ')}" data-title="r${row}c${col}" data-date="${calendar[row][col].toISODate()}">${calendar[row][col].day}</td>`;
+                    html += `<td class="${classes.join(' ')}" data-title="r${row}c${col}">${calendar[row][col].day}</td>`;
 
                 }
                 html += '</tr>';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "daterangepicker-4.x",
-  "version": "4.1.6",
-  "description": "Date range picker component for Bootstrap",
+  "version": "4.1.7",
+  "description": "Date range picker with time component and pre-defined ranges",
   "main": "daterangepicker.js",
   "style": "daterangepicker.css",
   "scripts": {
+    "postversion": "sed -i -e 's/daterangepicker-4.x@4\\.[0-9]\\+\\.[0-9]\\+/daterangepicker-4.x@%npm_package_version%/' README.md",
     "prepack": "sed -i '/# API Documentation/q' README.md",
     "prepare": "jsdoc2md --EOL win32 --example-lang js daterangepicker.js >> README.md",
     "postpack": "git commit -a -m \"Updated README.md\""
@@ -20,6 +21,20 @@
     "name": "wernfried Domscheit",
     "url": "https://www.domscheit.ch"
   },
+  "keywords": [
+    "daterangepicker",
+    "html",
+    "date",
+    "time",
+    "datepicker",
+    "timepicker",
+    "rangepicker",
+    "calendar"
+  ],
+  "files": [
+    "daterangepicker.js",
+    "daterangepicker.css"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/wernfried/daterangepicker/issues"

package/bower.json

@@ -1,20 +0,0 @@
-{
-  "name": "daterangepicker",
-  "main": [
-    "daterangepicker.js",
-    "daterangepicker.css"
-  ],
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "moment.js",
-    "moment.min.js"
-  ],
-  "dependencies": {
-    "jquery": "1.9.1 - 3",
-    "moment": ">=2.9.0"
- }
-}

package/demo.html

@@ -1,411 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" lang="en-US">
-
-<head>
-  <meta charset="UTF-8" />
-  <title>A date range picker for Bootstrap</title>
-
-  <link rel="stylesheet" type="text/css" media="all" href="daterangepicker.css" />
-
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.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="daterangepicker-luxon.js"></script>
-  <link rel="shortcut icon"
-    href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='1em' font-size='80'>📅</text></svg>" />
-
-  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-  <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-</head>
-
-<body style="margin: 20px 20px">
-
-  <div class="container">
-
-    <h1 style="margin: 0 0 20px 0">Configuration Builder</h1>
-
-    <div class="well configurator">
-
-      <form>
-        <div class="row">
-
-          <div class="col-md-4">
-
-            <div class="form-group">
-              <label for="parentEl">parentEl</label>
-              <input type="text" class="form-control" id="parentEl" value="" placeholder="body">
-            </div>
-
-            <div class="form-group">
-              <label for="startDate">startDate</label>
-              <input type="text" class="form-control" id="startDate" value="2025-03-04">
-            </div>
-
-            <div class="form-group">
-              <label for="endDate">endDate</label>
-              <input type="text" class="form-control" id="endDate" value="2025-03-21">
-            </div>
-
-            <div class="form-group">
-              <label for="minYear">minYear</label>
-              <input type="text" class="form-control" id="minYear" value="2020">
-            </div>
-
-            <div class="form-group">
-              <label for="maxYear">maxYear</label>
-              <input type="text" class="form-control" id="maxYear" value="2040">
-            </div>
-
-            <div class="form-group">
-              <label for="minDate">minDate</label>
-              <input type="text" class="form-control" id="minDate" value="" placeholder="YYYY-MM-DD">
-            </div>
-
-            <div class="form-group">
-              <label for="maxDate">maxDate</label>
-              <input type="text" class="form-control" id="maxDate" value="" placeholder="YYYY-MM-DD">
-            </div>
-
-          </div>
-          <div class="col-md-4">
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="autoApply"> autoApply
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="singleDatePicker"> singleDatePicker
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="showDropdowns"> showDropdowns
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="showWeekNumbers"> showWeekNumbers
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="showISOWeekNumbers"> showISOWeekNumbers
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="timePicker" checked="checked"> timePicker
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="timePicker24Hour"> timePicker24Hour
-              </label>
-            </div>
-
-            <div class="form-group">
-              <label for="timePickerStepSize">timePickerStepSize (in seconds)</label>
-              <input type="text" class="form-control" id="timePickerStepSize" value="600">
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="minSpan"> minSpan (with example date span)
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="maxSpan"> maxSpan (with example date span)
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="ranges" checked="checked"> ranges (with example predefined ranges)
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="locale"> locale (with example settings)
-              </label>
-              <label id="rtl-wrap">
-                <input type="checkbox" id="rtl"> RTL (right-to-left)
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="alwaysShowCalendars"> alwaysShowCalendars
-              </label>
-            </div>
-
-          </div>
-          <div class="col-md-4">
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="linkedCalendars" checked="checked"> linkedCalendars
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="autoUpdateInput" checked="checked"> autoUpdateInput
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="showCustomRangeLabel" checked="checked"> showCustomRangeLabel
-              </label>
-            </div>
-
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" id="durationLabel" checked="checked"> durationLabel (with example format)
-              </label>
-            </div>
-
-            <div class="form-group">
-              <label for="opens">opens</label>
-              <select id="opens" class="form-control">
-                <option value="right" selected>right</option>
-                <option value="left">left</option>
-                <option value="center">center</option>
-              </select>
-            </div>
-
-            <div class="form-group">
-              <label for="drops">drops</label>
-              <select id="drops" class="form-control">
-                <option value="down" selected>down</option>
-                <option value="up">up</option>
-              </select>
-            </div>
-
-            <div class="form-group">
-              <label for="buttonClasses">buttonClasses</label>
-              <input type="text" class="form-control" id="buttonClasses" value="btn btn-sm">
-            </div>
-
-            <div class="form-group">
-              <label for="applyClass">applyClass</label>
-              <input type="text" class="form-control" id="applyClass" value="btn-success">
-            </div>
-
-            <div class="form-group">
-              <label for="cancelClass">cancelClass</label>
-              <input type="text" class="form-control" id="cancelClass" value="btn-default">
-            </div>
-
-          </div>
-
-        </div>
-      </form>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-md-4 col-md-offset-2 demo">
-        <h4>Your Date Range Picker</h4>
-        <center>
-          <input type="text" id="config-demo" class="form-control">
-        </center>
-      </div>
-
-      <div class="col-md-6">
-        <h4>Configuration</h4>
-
-        <div class="well">
-          <textarea id="config-text" style="height: 300px; width: 100%; padding: 10px"></textarea>
-        </div>
-      </div>
-
-    </div>
-
-  </div>
-
-  <style type="text/css">
-    .demo {
-      position: relative;
-    }
-
-    .demo i {
-      position: absolute;
-      bottom: 10px;
-      right: 24px;
-      top: auto;
-      cursor: pointer;
-    }
-  </style>
-
-  <script type="text/javascript">
-    $(document).ready(function () {
-      const DateTime = luxon.DateTime;
-      const Duration = luxon.Duration;
-
-      $('#config-text').keyup(function () {
-        eval($(this).val());
-      });
-
-      $('.configurator input, .configurator select').change(function () {
-        updateConfig();
-      });
-
-      $('.demo i').click(function () {
-        $(this).parent().find('input').click();
-      });
-
-      $('#startDate').daterangepicker({
-        singleDatePicker: true,
-        startDate: DateTime.now().startOf('hour').minus({ days: 6 }).toISO()
-      });
-
-      $('#endDate').daterangepicker({
-        singleDatePicker: true,
-        endDate: DateTime.now().startOf('hour').toISO()
-      });
-
-      updateConfig();
-
-      function updateConfig() {
-        var options = {};
-
-        if ($('#singleDatePicker').is(':checked'))
-          options.singleDatePicker = true;
-
-        if ($('#showDropdowns').is(':checked'))
-          options.showDropdowns = true;
-
-        if ($('#showWeekNumbers').is(':checked'))
-          options.showWeekNumbers = true;
-
-        if ($('#showISOWeekNumbers').is(':checked'))
-          options.showISOWeekNumbers = true;
-
-        if ($('#timePicker').is(':checked'))
-          options.timePicker = true;
-
-        if ($('#timePicker24Hour').is(':checked'))
-          options.timePicker24Hour = true;
-
-        if ($('#minYear').val().length && $('#minYear').val() != 2020)
-          options.minYear = $('#minYear').val(), 10;
-
-        if ($('#maxYear ').val().length && $('#maxYear ').val() != 2040)
-          options.maxYear = $('#maxYear ').val(), 10;
-
-        if ($('#timePickerStepSize').val().length && $('#timePickerStepSize').val() != 600)
-          options.timePickerStepSize = $('#timePickerStepSize').val(), 10;
-
-        if ($('#autoApply').is(':checked'))
-          options.autoApply = true;
-
-        if ($('#minDate').val().length)
-          options.minDate = DateTime.now().minus({ month: 3 });
-
-        if ($('#maxDate').val().length)
-          options.maxDate = DateTime.now().minus({ years: 3 });
-
-
-        if ($('#ranges').is(':checked')) {
-          options.ranges = {
-            'Today': [DateTime.now().startOf('day'), DateTime.now().endOf('day')],
-            'Yesterday': [DateTime.now().startOf('day').minus({ days: 1 }), DateTime.now().minus({ days: 1 }).endOf('day')],
-            'Last 7 Days': [DateTime.now().startOf('day').minus({ days: 6 }), DateTime.now().endOf('day')],
-            'Last 30 Days': [DateTime.now().startOf('day').minus(29, 'days'), DateTime.now().endOf('day')],
-            'This Month': [DateTime.now().startOf('day').startOf('month'), DateTime.now().endOf('month')],
-            'Last Month': [DateTime.now().startOf('day').minus({ month: 1 }).startOf('month'), DateTime.now().minus({ month: 1 }).endOf('month')]
-          };
-        }
-
-        if ($('#locale').is(':checked')) {
-          $('#rtl-wrap').show();
-          options.locale = {
-            direction: $('#rtl').is(':checked') ? 'rtl' : 'ltr',
-            format: 'yyyy-MM-dd HH:mm',
-            separator: ' - ',
-            applyLabel: 'Apply',
-            cancelLabel: 'Cancel',
-            fromLabel: 'From',
-            toLabel: 'To',
-            customRangeLabel: 'Custom',
-            daysOfWeek: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
-            monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-            firstDay: 1
-          };
-        } else {
-          $('#rtl-wrap').hide();
-        }
-
-        if (!$('#linkedCalendars').is(':checked'))
-          options.linkedCalendars = false;
-
-        if (!$('#autoUpdateInput').is(':checked'))
-          options.autoUpdateInput = false;
-
-        if (!$('#showCustomRangeLabel').is(':checked'))
-          options.showCustomRangeLabel = false;
-
-        if ($('#alwaysShowCalendars').is(':checked'))
-          options.alwaysShowCalendars = true;
-
-        if ($('#parentEl').val().length)
-          options.parentEl = $('#parentEl').val();
-
-        if ($('#startDate').val().length)
-          options.startDate = $('#startDate').val();
-
-        if ($('#endDate').val().length)
-          options.endDate = $('#endDate').val();
-
-        if ($('#minDate').val().length)
-          options.minDate = $('#minDate').val();
-
-        if ($('#maxDate').val().length)
-          options.maxDate = $('#maxDate').val();
-
-        if ($('#opens').val().length && $('#opens').val() != 'right')
-          options.opens = $('#opens').val();
-
-        if ($('#drops').val().length && $('#drops').val() != 'down')
-          options.drops = $('#drops').val();
-
-        if ($('#buttonClasses').val().length && $('#buttonClasses').val() != 'btn btn-sm')
-          options.buttonClasses = $('#buttonClasses').val();
-
-        if ($('#applyClass').val().length && $('#applyClass').val() != 'btn-success')
-          options.applyClass = $('#applyClass').val();
-
-        if ($('#cancelClass').val().length && $('#cancelClass').val() != 'btn-default')
-          options.cancelClass = $('#cancelClass').val();
-
-        $('#config-text').val("$('#demo').daterangepicker(" + JSON.stringify(options, null, '    ') + ", function(start, end, label) {\n  console.log(\"New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')\");\n});");
-
-        $('#config-demo').daterangepicker(options, function (start, end, label) {
-          console.log('New date range selected: ' + start.toFormat('yyyy-MM-dd') + ' to ' + end.format('yyyy-MM-dd') + ' (predefined range: ' + label + ')');
-        }).click();;
-
-      }
-
-    });
-  </script>
-
-</body>
-
-</html>