From 1877ee74315afecbb2126f28ff5d9770771e6601 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 May 2020 13:10:52 +0300 Subject: [PATCH] Update daterangepicker to v3.1.0 (#2713) --- package-lock.json | 8 ++-- package.json | 2 +- plugins/daterangepicker/daterangepicker.js | 45 ++++++++++++++-------- plugins/daterangepicker/package.js | 2 +- plugins/daterangepicker/website/index.html | 15 ++++---- 5 files changed, 43 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44e6ad01f..cff1dfc78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "admin-lte", - "version": "3.0.4", + "version": "3.0.6-pre", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3301,9 +3301,9 @@ } }, "daterangepicker": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/daterangepicker/-/daterangepicker-3.0.5.tgz", - "integrity": "sha512-BoVV+OjVARWNE15iF+3Y2QIMioAD2UODHvJwIq+NtG0vxh61dXRmOMXlw2dsvxS8KY4n5uvIcBfIPiEiiGJcBg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/daterangepicker/-/daterangepicker-3.1.0.tgz", + "integrity": "sha512-DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw==", "requires": { "jquery": ">=1.10", "moment": "^2.9.0" diff --git a/package.json b/package.json index 1eb049cdb..ee8d7ed49 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "datatables.net-rowreorder-bs4": "^1.2.6", "datatables.net-scroller-bs4": "^2.0.1", "datatables.net-select-bs4": "^1.3.1", - "daterangepicker": "^3.0.5", + "daterangepicker": "^3.1.0", "ekko-lightbox": "^5.3.0", "fastclick": "^1.0.6", "filterizr": "^2.2.3", diff --git a/plugins/daterangepicker/daterangepicker.js b/plugins/daterangepicker/daterangepicker.js index 5d4d3281b..a3becee53 100644 --- a/plugins/daterangepicker/daterangepicker.js +++ b/plugins/daterangepicker/daterangepicker.js @@ -1,5 +1,5 @@ /** -* @version: 3.0.5 +* @version: 3.1 * @author: Dan Grossman http://www.dangrossman.info/ * @copyright: Copyright (c) 2012-2019 Dan Grossman. All rights reserved. * @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php @@ -11,7 +11,7 @@ // AMD. Make globaly available as well define(['moment', 'jquery'], function (moment, jquery) { if (!jquery.fn) jquery.fn = {}; // webpack server rendering - if (typeof moment !== 'function' && moment.default) moment = moment.default + if (typeof moment !== 'function' && moment.hasOwnProperty('default')) moment = moment['default'] return factory(moment, jquery); }); } else if (typeof module === 'object' && module.exports) { @@ -386,7 +386,7 @@ this.container.find('.drp-calendar.left').addClass('single'); this.container.find('.drp-calendar.left').show(); this.container.find('.drp-calendar.right').hide(); - if (!this.timePicker) { + if (!this.timePicker && this.autoApply) { this.container.addClass('auto-apply'); } } @@ -417,14 +417,14 @@ .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.hoverDate, this)) .on('change.daterangepicker', 'select.yearselect', $.proxy(this.monthOrYearChanged, this)) .on('change.daterangepicker', 'select.monthselect', $.proxy(this.monthOrYearChanged, this)) - .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.timeChanged, this)) + .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.timeChanged, this)); this.container.find('.ranges') - .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this)) + .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this)); this.container.find('.drp-buttons') .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this)) - .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this)) + .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this)); if (this.element.is('input') || this.element.is('button')) { this.element.on({ @@ -526,9 +526,9 @@ this.renderTimePicker('left'); this.renderTimePicker('right'); if (!this.endDate) { - this.container.find('.right .calendar-time select').attr('disabled', 'disabled').addClass('disabled'); + this.container.find('.right .calendar-time select').prop('disabled', true).addClass('disabled'); } else { - this.container.find('.right .calendar-time select').removeAttr('disabled').removeClass('disabled'); + this.container.find('.right .calendar-time select').prop('disabled', false).removeClass('disabled'); } } if (this.endDate) @@ -1014,16 +1014,18 @@ updateFormInputs: function() { if (this.singleDatePicker || (this.endDate && (this.startDate.isBefore(this.endDate) || this.startDate.isSame(this.endDate)))) { - this.container.find('button.applyBtn').removeAttr('disabled'); + this.container.find('button.applyBtn').prop('disabled', false); } else { - this.container.find('button.applyBtn').attr('disabled', 'disabled'); + this.container.find('button.applyBtn').prop('disabled', true); } }, move: function() { var parentOffset = { top: 0, left: 0 }, - containerTop; + containerTop, + drops = this.drops; + var parentRightEdge = $(window).width(); if (!this.parentEl.is('body')) { parentOffset = { @@ -1033,10 +1035,21 @@ parentRightEdge = this.parentEl[0].clientWidth + this.parentEl.offset().left; } - if (this.drops == 'up') - containerTop = this.element.offset().top - this.container.outerHeight() - parentOffset.top; - else + switch (drops) { + case 'auto': containerTop = this.element.offset().top + this.element.outerHeight() - parentOffset.top; + if (containerTop + this.container.outerHeight() >= this.parentEl[0].scrollHeight) { + containerTop = this.element.offset().top - this.container.outerHeight() - parentOffset.top; + drops = 'up'; + } + break; + case 'up': + containerTop = this.element.offset().top - this.container.outerHeight() - parentOffset.top; + break; + default: + containerTop = this.element.offset().top + this.element.outerHeight() - parentOffset.top; + break; + } // Force the container to it's actual width this.container.css({ @@ -1046,7 +1059,7 @@ }); var containerWidth = this.container.outerWidth(); - this.container[this.drops == 'up' ? 'addClass' : 'removeClass']('drop-up'); + this.container.toggleClass('drop-up', drops == 'up'); if (this.opens == 'left') { var containerRight = parentRightEdge - this.element.offset().left - this.element.outerWidth(); @@ -1341,7 +1354,7 @@ if (this.singleDatePicker) { this.setEndDate(this.startDate); - if (!this.timePicker) + if (!this.timePicker && this.autoApply) this.clickApply(); } diff --git a/plugins/daterangepicker/package.js b/plugins/daterangepicker/package.js index 373de764f..9b19e5360 100644 --- a/plugins/daterangepicker/package.js +++ b/plugins/daterangepicker/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'dangrossman:bootstrap-daterangepicker', - version: '3.0.5', + version: '3.1.0', summary: 'Date range picker component', git: 'https://github.com/dangrossman/daterangepicker', documentation: 'README.md' diff --git a/plugins/daterangepicker/website/index.html b/plugins/daterangepicker/website/index.html index f86103fd6..0954e5f16 100644 --- a/plugins/daterangepicker/website/index.html +++ b/plugins/daterangepicker/website/index.html @@ -263,7 +263,7 @@ }, cb); cb(start, end); - + }); @@ -282,7 +282,7 @@
- +
- +