diff --git a/bower.json b/bower.json
index ec84f8dea..36e6c97ac 100644
--- a/bower.json
+++ b/bower.json
@@ -58,5 +58,8 @@
"font-awesome": "^4.7.0",
"Ionicons": "ionicons#^2.0.1",
"jquery-ui": "1.11.4"
+ },
+ "resolutions": {
+ "jquery": "^3.2.1"
}
}
diff --git a/bower_components/bootstrap-daterangepicker/.bower.json b/bower_components/bootstrap-daterangepicker/.bower.json
index 9e5eeab5a..859cfc5f9 100644
--- a/bower_components/bootstrap-daterangepicker/.bower.json
+++ b/bower_components/bootstrap-daterangepicker/.bower.json
@@ -18,12 +18,12 @@
"moment": ">=2.9.0"
},
"homepage": "https://github.com/dangrossman/bootstrap-daterangepicker",
- "version": "2.1.25",
- "_release": "2.1.25",
+ "version": "2.1.27",
+ "_release": "2.1.27",
"_resolution": {
"type": "version",
- "tag": "v2.1.25",
- "commit": "29bbf5a04df69fda363cedb534272ac344524e57"
+ "tag": "v2.1.27",
+ "commit": "d4aabfbceaf57117e1af33f3f82e92162719eee9"
},
"_source": "https://github.com/dangrossman/bootstrap-daterangepicker.git",
"_target": "^2.1.25",
diff --git a/bower_components/bootstrap-daterangepicker/README.md b/bower_components/bootstrap-daterangepicker/README.md
index 30d319743..d6be83daa 100644
--- a/bower_components/bootstrap-daterangepicker/README.md
+++ b/bower_components/bootstrap-daterangepicker/README.md
@@ -23,7 +23,7 @@ for convenience. It is available under the [MIT license](http://www.opensource.o
The MIT License (MIT)
-Copyright (c) 2012-2016 Dan Grossman
+Copyright (c) 2012-2017 Dan Grossman
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/bower_components/bootstrap-daterangepicker/daterangepicker.js b/bower_components/bootstrap-daterangepicker/daterangepicker.js
index 733d27405..079cde61c 100644
--- a/bower_components/bootstrap-daterangepicker/daterangepicker.js
+++ b/bower_components/bootstrap-daterangepicker/daterangepicker.js
@@ -1,16 +1,17 @@
/**
-* @version: 2.1.25
+* @version: 2.1.27
* @author: Dan Grossman http://www.dangrossman.info/
* @copyright: Copyright (c) 2012-2017 Dan Grossman. All rights reserved.
* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
-* @website: https://www.daterangepicker.com/
+* @website: http://www.daterangepicker.com/
*/
// Follow the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Make globaly available as well
define(['moment', 'jquery'], function (moment, jquery) {
- return (root.daterangepicker = factory(moment, jquery));
+ if (!jquery.fn) jquery.fn = {}; // webpack server rendering
+ return factory(moment, jquery);
});
} else if (typeof module === 'object' && module.exports) {
// Node / Browserify
@@ -20,7 +21,8 @@
jQuery = require('jquery');
if (!jQuery.fn) jQuery.fn = {};
}
- module.exports = factory(require('moment'), jQuery);
+ var moment = (typeof window != 'undefined' && typeof window.moment != 'undefined') ? window.moment : require('moment');
+ module.exports = factory(moment, jQuery);
} else {
// Browser globals
root.daterangepicker = factory(root.moment, root.jQuery);
@@ -422,7 +424,8 @@
.on('click.daterangepicker', '.daterangepicker_input input', $.proxy(this.showCalendars, this))
.on('focus.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsFocused, this))
.on('blur.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsBlurred, this))
- .on('change.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsChanged, this));
+ .on('change.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsChanged, this))
+ .on('keydown.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsKeydown, this));
this.container.find('.ranges')
.on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
@@ -436,10 +439,11 @@
'click.daterangepicker': $.proxy(this.show, this),
'focus.daterangepicker': $.proxy(this.show, this),
'keyup.daterangepicker': $.proxy(this.elementChanged, this),
- 'keydown.daterangepicker': $.proxy(this.keydown, this)
+ 'keydown.daterangepicker': $.proxy(this.keydown, this) //IE 11 compatibility
});
} else {
this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
+ this.element.on('keydown.daterangepicker', $.proxy(this.toggle, this));
}
//
@@ -499,7 +503,7 @@
this.endDate = moment(endDate);
if (!this.timePicker)
- this.endDate = this.endDate.endOf('day');
+ this.endDate = this.endDate.add(1,'d').startOf('day').subtract(1,'second');
if (this.timePicker && this.timePickerIncrement)
this.endDate.minute(Math.round(this.endDate.minute() / this.timePickerIncrement) * this.timePickerIncrement);
@@ -1370,8 +1374,10 @@
var customRange = true;
var i = 0;
for (var range in this.ranges) {
- if (this.timePicker) {
- if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
+ if (this.timePicker) {
+ var format = this.timePickerSeconds ? "YYYY-MM-DD hh:mm:ss" : "YYYY-MM-DD hh:mm";
+ //ignore times when comparing dates if time picker seconds is not enabled
+ if (this.startDate.format(format) == this.ranges[range][0].format(format) && this.endDate.format(format) == this.ranges[range][1].format(format)) {
customRange = false;
this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
break;
@@ -1560,10 +1566,22 @@
},
+ formInputsKeydown: function(e) {
+ // This function ensures that if the 'enter' key was pressed in the input, then the calendars
+ // are updated with the startDate and endDate.
+ // This behaviour is automatic in Chrome/Firefox/Edge but not in IE 11 hence why this exists.
+ // Other browsers and versions of IE are untested and the behaviour is unknown.
+ if (e.keyCode === 13) {
+ // Prevent the calendar from being updated twice on Chrome/Firefox/Edge
+ e.preventDefault();
+ this.formInputsChanged(e);
+ }
+ },
+
+
elementChanged: function() {
if (!this.element.is('input')) return;
if (!this.element.val().length) return;
- if (this.element.val().length < this.locale.format.length) return;
var dateString = this.element.val().split(this.locale.separator),
start = null,
@@ -1591,6 +1609,14 @@
if ((e.keyCode === 9) || (e.keyCode === 13)) {
this.hide();
}
+
+ //hide on esc and prevent propagation
+ if (e.keyCode === 27) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ this.hide();
+ }
},
updateElement: function() {
@@ -1612,11 +1638,12 @@
};
$.fn.daterangepicker = function(options, callback) {
+ var implementOptions = $.extend(true, {}, $.fn.daterangepicker.defaultOptions, options);
this.each(function() {
var el = $(this);
if (el.data('daterangepicker'))
el.data('daterangepicker').remove();
- el.data('daterangepicker', new DateRangePicker(el, options, callback));
+ el.data('daterangepicker', new DateRangePicker(el, implementOptions, callback));
});
return this;
};
diff --git a/bower_components/bootstrap-daterangepicker/package.js b/bower_components/bootstrap-daterangepicker/package.js
index b89a2d6ca..3dbe8b449 100644
--- a/bower_components/bootstrap-daterangepicker/package.js
+++ b/bower_components/bootstrap-daterangepicker/package.js
@@ -1,6 +1,6 @@
Package.describe({
name: 'dangrossman:bootstrap-daterangepicker',
- version: '2.1.25',
+ version: '2.1.27',
summary: 'Date range picker component for Bootstrap',
git: 'https://github.com/dangrossman/bootstrap-daterangepicker',
documentation: 'README.md'
diff --git a/bower_components/bootstrap-daterangepicker/package.json b/bower_components/bootstrap-daterangepicker/package.json
index 9f915f8f4..552bac647 100644
--- a/bower_components/bootstrap-daterangepicker/package.json
+++ b/bower_components/bootstrap-daterangepicker/package.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap-daterangepicker",
- "version": "2.1.25",
+ "version": "2.1.27",
"description": "Date range picker component for Bootstrap",
"main": "daterangepicker.js",
"style": "daterangepicker.css",
diff --git a/bower_components/bootstrap-daterangepicker/website/index.html b/bower_components/bootstrap-daterangepicker/website/index.html
index 2389ea090..fb9c66c15 100644
--- a/bower_components/bootstrap-daterangepicker/website/index.html
+++ b/bower_components/bootstrap-daterangepicker/website/index.html
@@ -39,15 +39,6 @@
@@ -210,7 +201,7 @@
Demo:
-
Demo:
-
startDate
-
endDate
-
-
-
-
-
-
+
-
-
+