mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-16 22:58:09 +00:00
Various code cleanup
This commit is contained in:
James Cole
@@ -1,10 +1,10 @@
|
||||
/**
|
||||
* @version: 2.1.25
|
||||
* @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: http://www.daterangepicker.com/
|
||||
*/
|
||||
* @version: 2.1.25
|
||||
* @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: 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) {
|
||||
@@ -27,8 +27,8 @@
|
||||
// Browser globals
|
||||
root.daterangepicker = factory(root.moment, root.jQuery);
|
||||
}
|
||||
}(this, function(moment, $) {
|
||||
var DateRangePicker = function(element, options, cb) {
|
||||
}(this, function (moment, $) {
|
||||
var DateRangePicker = function (element, options, cb) {
|
||||
|
||||
//default settings for options
|
||||
this.parentEl = 'body';
|
||||
@@ -78,7 +78,8 @@
|
||||
firstDay: moment.localeData().firstDayOfWeek()
|
||||
};
|
||||
|
||||
this.callback = function() { };
|
||||
this.callback = function () {
|
||||
};
|
||||
|
||||
//some state information
|
||||
this.isShowing = false;
|
||||
@@ -96,35 +97,35 @@
|
||||
//html template for the picker UI
|
||||
if (typeof options.template !== 'string' && !(options.template instanceof $))
|
||||
options.template = '<div class="daterangepicker dropdown-menu">' +
|
||||
'<div class="calendar left">' +
|
||||
'<div class="daterangepicker_input">' +
|
||||
'<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
|
||||
'<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
|
||||
'<div class="calendar-time">' +
|
||||
'<div></div>' +
|
||||
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="calendar-table"></div>' +
|
||||
'</div>' +
|
||||
'<div class="calendar right">' +
|
||||
'<div class="daterangepicker_input">' +
|
||||
'<input class="input-mini form-control" type="text" name="daterangepicker_end" value="" />' +
|
||||
'<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
|
||||
'<div class="calendar-time">' +
|
||||
'<div></div>' +
|
||||
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="calendar-table"></div>' +
|
||||
'</div>' +
|
||||
'<div class="ranges">' +
|
||||
'<div class="range_inputs">' +
|
||||
'<button class="applyBtn" disabled="disabled" type="button"></button> ' +
|
||||
'<button class="cancelBtn" type="button"></button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>';
|
||||
'<div class="calendar left">' +
|
||||
'<div class="daterangepicker_input">' +
|
||||
'<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
|
||||
'<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
|
||||
'<div class="calendar-time">' +
|
||||
'<div></div>' +
|
||||
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="calendar-table"></div>' +
|
||||
'</div>' +
|
||||
'<div class="calendar right">' +
|
||||
'<div class="daterangepicker_input">' +
|
||||
'<input class="input-mini form-control" type="text" name="daterangepicker_end" value="" />' +
|
||||
'<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
|
||||
'<div class="calendar-time">' +
|
||||
'<div></div>' +
|
||||
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="calendar-table"></div>' +
|
||||
'</div>' +
|
||||
'<div class="ranges">' +
|
||||
'<div class="range_inputs">' +
|
||||
'<button class="applyBtn" disabled="disabled" type="button"></button> ' +
|
||||
'<button class="cancelBtn" type="button"></button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>';
|
||||
|
||||
this.parentEl = (options.parentEl && $(options.parentEl).length) ? $(options.parentEl) : $(this.parentEl);
|
||||
this.container = $(options.template).appendTo(this.parentEl);
|
||||
@@ -148,21 +149,21 @@
|
||||
this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
|
||||
|
||||
if (typeof options.locale.monthNames === 'object')
|
||||
this.locale.monthNames = options.locale.monthNames.slice();
|
||||
this.locale.monthNames = options.locale.monthNames.slice();
|
||||
|
||||
if (typeof options.locale.firstDay === 'number')
|
||||
this.locale.firstDay = options.locale.firstDay;
|
||||
this.locale.firstDay = options.locale.firstDay;
|
||||
|
||||
if (typeof options.locale.applyLabel === 'string')
|
||||
this.locale.applyLabel = options.locale.applyLabel;
|
||||
this.locale.applyLabel = options.locale.applyLabel;
|
||||
|
||||
if (typeof options.locale.cancelLabel === 'string')
|
||||
this.locale.cancelLabel = options.locale.cancelLabel;
|
||||
this.locale.cancelLabel = options.locale.cancelLabel;
|
||||
|
||||
if (typeof options.locale.weekLabel === 'string')
|
||||
this.locale.weekLabel = options.locale.weekLabel;
|
||||
this.locale.weekLabel = options.locale.weekLabel;
|
||||
|
||||
if (typeof options.locale.customRangeLabel === 'string'){
|
||||
if (typeof options.locale.customRangeLabel === 'string') {
|
||||
//Support unicode chars in the custom range name.
|
||||
var elem = document.createElement('textarea');
|
||||
elem.innerHTML = options.locale.customRangeLabel;
|
||||
@@ -287,7 +288,7 @@
|
||||
//if no start/end dates set, check if an input element contains initial values
|
||||
if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') {
|
||||
if ($(this.element).is('input[type=text]')) {
|
||||
var val = $(this.element).val(),
|
||||
var val = $(this.element).val(),
|
||||
split = val.split(this.locale.separator);
|
||||
|
||||
start = end = null;
|
||||
@@ -332,8 +333,8 @@
|
||||
|
||||
// If the end of the range is before the minimum or the start of the range is
|
||||
// after the maximum, don't display this range option at all.
|
||||
if ((this.minDate && end.isBefore(this.minDate, this.timepicker ? 'minute' : 'day'))
|
||||
|| (maxDate && start.isAfter(maxDate, this.timepicker ? 'minute' : 'day')))
|
||||
if ((this.minDate && end.isBefore(this.minDate, this.timepicker ? 'minute' : 'day'))
|
||||
|| (maxDate && start.isAfter(maxDate, this.timepicker ? 'minute' : 'day')))
|
||||
continue;
|
||||
|
||||
//Support unicode chars in the range names.
|
||||
@@ -396,7 +397,7 @@
|
||||
|
||||
//swap the position of the predefined ranges if opens right
|
||||
if (typeof options.ranges !== 'undefined' && this.opens == 'right') {
|
||||
this.container.find('.ranges').prependTo( this.container.find('.calendar.left').parent() );
|
||||
this.container.find('.ranges').prependTo(this.container.find('.calendar.left').parent());
|
||||
}
|
||||
|
||||
//apply CSS classes and labels to buttons
|
||||
@@ -435,11 +436,11 @@
|
||||
|
||||
if (this.element.is('input') || this.element.is('button')) {
|
||||
this.element.on({
|
||||
'click.daterangepicker': $.proxy(this.show, this),
|
||||
'focus.daterangepicker': $.proxy(this.show, this),
|
||||
'keyup.daterangepicker': $.proxy(this.elementChanged, this),
|
||||
'keydown.daterangepicker': $.proxy(this.keydown, this)
|
||||
});
|
||||
'click.daterangepicker': $.proxy(this.show, this),
|
||||
'focus.daterangepicker': $.proxy(this.show, this),
|
||||
'keyup.daterangepicker': $.proxy(this.elementChanged, this),
|
||||
'keydown.daterangepicker': $.proxy(this.keydown, this)
|
||||
});
|
||||
} else {
|
||||
this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
|
||||
}
|
||||
@@ -462,7 +463,7 @@
|
||||
|
||||
constructor: DateRangePicker,
|
||||
|
||||
setStartDate: function(startDate) {
|
||||
setStartDate: function (startDate) {
|
||||
if (typeof startDate === 'string')
|
||||
this.startDate = moment(startDate, this.locale.format);
|
||||
|
||||
@@ -493,7 +494,7 @@
|
||||
this.updateMonthsInView();
|
||||
},
|
||||
|
||||
setEndDate: function(endDate) {
|
||||
setEndDate: function (endDate) {
|
||||
if (typeof endDate === 'string')
|
||||
this.endDate = moment(endDate, this.locale.format);
|
||||
|
||||
@@ -523,15 +524,15 @@
|
||||
this.updateMonthsInView();
|
||||
},
|
||||
|
||||
isInvalidDate: function() {
|
||||
isInvalidDate: function () {
|
||||
return false;
|
||||
},
|
||||
|
||||
isCustomDate: function() {
|
||||
isCustomDate: function () {
|
||||
return false;
|
||||
},
|
||||
|
||||
updateView: function() {
|
||||
updateView: function () {
|
||||
if (this.timePicker) {
|
||||
this.renderTimePicker('left');
|
||||
this.renderTimePicker('right');
|
||||
@@ -553,7 +554,7 @@
|
||||
this.updateFormInputs();
|
||||
},
|
||||
|
||||
updateMonthsInView: function() {
|
||||
updateMonthsInView: function () {
|
||||
if (this.endDate) {
|
||||
|
||||
//if both dates are visible already, do nothing
|
||||
@@ -561,7 +562,7 @@
|
||||
(this.startDate.format('YYYY-MM') == this.leftCalendar.month.format('YYYY-MM') || this.startDate.format('YYYY-MM') == this.rightCalendar.month.format('YYYY-MM'))
|
||||
&&
|
||||
(this.endDate.format('YYYY-MM') == this.leftCalendar.month.format('YYYY-MM') || this.endDate.format('YYYY-MM') == this.rightCalendar.month.format('YYYY-MM'))
|
||||
) {
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -579,12 +580,12 @@
|
||||
}
|
||||
}
|
||||
if (this.maxDate && this.linkedCalendars && !this.singleDatePicker && this.rightCalendar.month > this.maxDate) {
|
||||
this.rightCalendar.month = this.maxDate.clone().date(2);
|
||||
this.leftCalendar.month = this.maxDate.clone().date(2).subtract(1, 'month');
|
||||
this.rightCalendar.month = this.maxDate.clone().date(2);
|
||||
this.leftCalendar.month = this.maxDate.clone().date(2).subtract(1, 'month');
|
||||
}
|
||||
},
|
||||
|
||||
updateCalendars: function() {
|
||||
updateCalendars: function () {
|
||||
|
||||
if (this.timePicker) {
|
||||
var hour, minute, second;
|
||||
@@ -625,7 +626,7 @@
|
||||
this.calculateChosenLabel();
|
||||
},
|
||||
|
||||
renderCalendar: function(side) {
|
||||
renderCalendar: function (side) {
|
||||
|
||||
//
|
||||
// Build the matrix of dates that will populate the calendar
|
||||
@@ -727,12 +728,12 @@
|
||||
for (var m = 0; m < 12; m++) {
|
||||
if ((!inMinYear || m >= minDate.month()) && (!inMaxYear || m <= maxDate.month())) {
|
||||
monthHtml += "<option value='" + m + "'" +
|
||||
(m === currentMonth ? " selected='selected'" : "") +
|
||||
">" + this.locale.monthNames[m] + "</option>";
|
||||
(m === currentMonth ? " selected='selected'" : "") +
|
||||
">" + this.locale.monthNames[m] + "</option>";
|
||||
} else {
|
||||
monthHtml += "<option value='" + m + "'" +
|
||||
(m === currentMonth ? " selected='selected'" : "") +
|
||||
" disabled='disabled'>" + this.locale.monthNames[m] + "</option>";
|
||||
(m === currentMonth ? " selected='selected'" : "") +
|
||||
" disabled='disabled'>" + this.locale.monthNames[m] + "</option>";
|
||||
}
|
||||
}
|
||||
monthHtml += "</select>";
|
||||
@@ -740,8 +741,8 @@
|
||||
var yearHtml = '<select class="yearselect">';
|
||||
for (var y = minYear; y <= maxYear; y++) {
|
||||
yearHtml += '<option value="' + y + '"' +
|
||||
(y === currentYear ? ' selected="selected"' : '') +
|
||||
'>' + y + '</option>';
|
||||
(y === currentYear ? ' selected="selected"' : '') +
|
||||
'>' + y + '</option>';
|
||||
}
|
||||
yearHtml += '</select>';
|
||||
|
||||
@@ -762,7 +763,7 @@
|
||||
if (this.showWeekNumbers || this.showISOWeekNumbers)
|
||||
html += '<th class="week">' + this.locale.weekLabel + '</th>';
|
||||
|
||||
$.each(this.locale.daysOfWeek, function(index, dayOfWeek) {
|
||||
$.each(this.locale.daysOfWeek, function (index, dayOfWeek) {
|
||||
html += '<th>' + dayOfWeek + '</th>';
|
||||
});
|
||||
|
||||
@@ -859,7 +860,7 @@
|
||||
|
||||
},
|
||||
|
||||
renderTimePicker: function(side) {
|
||||
renderTimePicker: function (side) {
|
||||
|
||||
// Don't bother updating the time picker if it's currently disabled
|
||||
// because an end date hasn't been clicked yet
|
||||
@@ -1020,7 +1021,7 @@
|
||||
|
||||
},
|
||||
|
||||
updateFormInputs: function() {
|
||||
updateFormInputs: function () {
|
||||
|
||||
//ignore mouse movements while an above-calendar text input has focus
|
||||
if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
|
||||
@@ -1038,8 +1039,8 @@
|
||||
|
||||
},
|
||||
|
||||
move: function() {
|
||||
var parentOffset = { top: 0, left: 0 },
|
||||
move: function () {
|
||||
var parentOffset = {top: 0, left: 0},
|
||||
containerTop;
|
||||
var parentRightEdge = $(window).width();
|
||||
if (!this.parentEl.is('body')) {
|
||||
@@ -1058,62 +1059,66 @@
|
||||
|
||||
if (this.opens == 'left') {
|
||||
this.container.css({
|
||||
top: containerTop,
|
||||
right: parentRightEdge - this.element.offset().left - this.element.outerWidth(),
|
||||
left: 'auto'
|
||||
});
|
||||
top: containerTop,
|
||||
right: parentRightEdge - this.element.offset().left - this.element.outerWidth(),
|
||||
left: 'auto'
|
||||
});
|
||||
if (this.container.offset().left < 0) {
|
||||
this.container.css({
|
||||
right: 'auto',
|
||||
left: 9
|
||||
});
|
||||
right: 'auto',
|
||||
left: 9
|
||||
});
|
||||
}
|
||||
} else if (this.opens == 'center') {
|
||||
this.container.css({
|
||||
top: containerTop,
|
||||
left: this.element.offset().left - parentOffset.left + this.element.outerWidth() / 2
|
||||
- this.container.outerWidth() / 2,
|
||||
right: 'auto'
|
||||
});
|
||||
top: containerTop,
|
||||
left: this.element.offset().left - parentOffset.left + this.element.outerWidth() / 2
|
||||
- this.container.outerWidth() / 2,
|
||||
right: 'auto'
|
||||
});
|
||||
if (this.container.offset().left < 0) {
|
||||
this.container.css({
|
||||
right: 'auto',
|
||||
left: 9
|
||||
});
|
||||
right: 'auto',
|
||||
left: 9
|
||||
});
|
||||
}
|
||||
} else {
|
||||
this.container.css({
|
||||
top: containerTop,
|
||||
left: this.element.offset().left - parentOffset.left,
|
||||
right: 'auto'
|
||||
});
|
||||
top: containerTop,
|
||||
left: this.element.offset().left - parentOffset.left,
|
||||
right: 'auto'
|
||||
});
|
||||
if (this.container.offset().left + this.container.outerWidth() > $(window).width()) {
|
||||
this.container.css({
|
||||
left: 'auto',
|
||||
right: 0
|
||||
});
|
||||
left: 'auto',
|
||||
right: 0
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
show: function(e) {
|
||||
show: function (e) {
|
||||
if (this.isShowing) return;
|
||||
|
||||
// Create a click proxy that is private to this instance of datepicker, for unbinding
|
||||
this._outsideClickProxy = $.proxy(function(e) { this.outsideClick(e); }, this);
|
||||
this._outsideClickProxy = $.proxy(function (e) {
|
||||
this.outsideClick(e);
|
||||
}, this);
|
||||
|
||||
// Bind global datepicker mousedown for hiding and
|
||||
$(document)
|
||||
.on('mousedown.daterangepicker', this._outsideClickProxy)
|
||||
// also support mobile devices
|
||||
.on('touchend.daterangepicker', this._outsideClickProxy)
|
||||
// also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
|
||||
.on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy)
|
||||
// and also close when focus changes to outside the picker (eg. tabbing between controls)
|
||||
.on('focusin.daterangepicker', this._outsideClickProxy);
|
||||
.on('mousedown.daterangepicker', this._outsideClickProxy)
|
||||
// also support mobile devices
|
||||
.on('touchend.daterangepicker', this._outsideClickProxy)
|
||||
// also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
|
||||
.on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy)
|
||||
// and also close when focus changes to outside the picker (eg. tabbing between controls)
|
||||
.on('focusin.daterangepicker', this._outsideClickProxy);
|
||||
|
||||
// Reposition the picker if the window is resized while it's open
|
||||
$(window).on('resize.daterangepicker', $.proxy(function(e) { this.move(e); }, this));
|
||||
$(window).on('resize.daterangepicker', $.proxy(function (e) {
|
||||
this.move(e);
|
||||
}, this));
|
||||
|
||||
this.oldStartDate = this.startDate.clone();
|
||||
this.oldEndDate = this.endDate.clone();
|
||||
@@ -1126,7 +1131,7 @@
|
||||
this.isShowing = true;
|
||||
},
|
||||
|
||||
hide: function(e) {
|
||||
hide: function (e) {
|
||||
if (!this.isShowing) return;
|
||||
|
||||
//incomplete date selection, revert to last values
|
||||
@@ -1149,7 +1154,7 @@
|
||||
this.isShowing = false;
|
||||
},
|
||||
|
||||
toggle: function(e) {
|
||||
toggle: function (e) {
|
||||
if (this.isShowing) {
|
||||
this.hide();
|
||||
} else {
|
||||
@@ -1157,33 +1162,33 @@
|
||||
}
|
||||
},
|
||||
|
||||
outsideClick: function(e) {
|
||||
outsideClick: function (e) {
|
||||
var target = $(e.target);
|
||||
// if the page is clicked anywhere except within the daterangerpicker/button
|
||||
// itself then call this.hide()
|
||||
if (
|
||||
// ie modal dialog fix
|
||||
e.type == "focusin" ||
|
||||
target.closest(this.element).length ||
|
||||
target.closest(this.container).length ||
|
||||
target.closest('.calendar-table').length
|
||||
) return;
|
||||
e.type == "focusin" ||
|
||||
target.closest(this.element).length ||
|
||||
target.closest(this.container).length ||
|
||||
target.closest('.calendar-table').length
|
||||
) return;
|
||||
this.hide();
|
||||
this.element.trigger('outsideClick.daterangepicker', this);
|
||||
},
|
||||
|
||||
showCalendars: function() {
|
||||
showCalendars: function () {
|
||||
this.container.addClass('show-calendar');
|
||||
this.move();
|
||||
this.element.trigger('showCalendar.daterangepicker', this);
|
||||
},
|
||||
|
||||
hideCalendars: function() {
|
||||
hideCalendars: function () {
|
||||
this.container.removeClass('show-calendar');
|
||||
this.element.trigger('hideCalendar.daterangepicker', this);
|
||||
},
|
||||
|
||||
hoverRange: function(e) {
|
||||
hoverRange: function (e) {
|
||||
|
||||
//ignore mouse movements while an above-calendar text input has focus
|
||||
if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
|
||||
@@ -1201,7 +1206,7 @@
|
||||
|
||||
},
|
||||
|
||||
clickRange: function(e) {
|
||||
clickRange: function (e) {
|
||||
var label = e.target.getAttribute('data-range-key');
|
||||
this.chosenLabel = label;
|
||||
if (label == this.locale.customRangeLabel) {
|
||||
@@ -1222,7 +1227,7 @@
|
||||
}
|
||||
},
|
||||
|
||||
clickPrev: function(e) {
|
||||
clickPrev: function (e) {
|
||||
var cal = $(e.target).parents('.calendar');
|
||||
if (cal.hasClass('left')) {
|
||||
this.leftCalendar.month.subtract(1, 'month');
|
||||
@@ -1234,7 +1239,7 @@
|
||||
this.updateCalendars();
|
||||
},
|
||||
|
||||
clickNext: function(e) {
|
||||
clickNext: function (e) {
|
||||
var cal = $(e.target).parents('.calendar');
|
||||
if (cal.hasClass('left')) {
|
||||
this.leftCalendar.month.add(1, 'month');
|
||||
@@ -1246,7 +1251,7 @@
|
||||
this.updateCalendars();
|
||||
},
|
||||
|
||||
hoverDate: function(e) {
|
||||
hoverDate: function (e) {
|
||||
|
||||
//ignore mouse movements while an above-calendar text input has focus
|
||||
//if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
|
||||
@@ -1273,7 +1278,7 @@
|
||||
var rightCalendar = this.rightCalendar;
|
||||
var startDate = this.startDate;
|
||||
if (!this.endDate) {
|
||||
this.container.find('.calendar tbody td').each(function(index, el) {
|
||||
this.container.find('.calendar tbody td').each(function (index, el) {
|
||||
|
||||
//skip week numbers, only look at dates
|
||||
if ($(el).hasClass('week')) return;
|
||||
@@ -1295,7 +1300,7 @@
|
||||
|
||||
},
|
||||
|
||||
clickDate: function(e) {
|
||||
clickDate: function (e) {
|
||||
|
||||
if (!$(e.target).hasClass('available')) return;
|
||||
|
||||
@@ -1350,8 +1355,8 @@
|
||||
}
|
||||
this.setEndDate(date.clone());
|
||||
if (this.autoApply) {
|
||||
this.calculateChosenLabel();
|
||||
this.clickApply();
|
||||
this.calculateChosenLabel();
|
||||
this.clickApply();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1398,22 +1403,22 @@
|
||||
}
|
||||
},
|
||||
|
||||
clickApply: function(e) {
|
||||
clickApply: function (e) {
|
||||
this.hide();
|
||||
this.element.trigger('apply.daterangepicker', this);
|
||||
},
|
||||
|
||||
clickCancel: function(e) {
|
||||
clickCancel: function (e) {
|
||||
this.startDate = this.oldStartDate;
|
||||
this.endDate = this.oldEndDate;
|
||||
this.hide();
|
||||
this.element.trigger('cancel.daterangepicker', this);
|
||||
},
|
||||
|
||||
monthOrYearChanged: function(e) {
|
||||
var isLeft = $(e.target).closest('.calendar').hasClass('left'),
|
||||
monthOrYearChanged: function (e) {
|
||||
var isLeft = $(e.target).closest('.calendar').hasClass('left'),
|
||||
leftOrRight = isLeft ? 'left' : 'right',
|
||||
cal = this.container.find('.calendar.'+leftOrRight);
|
||||
cal = this.container.find('.calendar.' + leftOrRight);
|
||||
|
||||
// Month must be Number for new moment versions
|
||||
var month = parseInt(cal.find('.monthselect').val(), 10);
|
||||
@@ -1452,9 +1457,9 @@
|
||||
this.updateCalendars();
|
||||
},
|
||||
|
||||
timeChanged: function(e) {
|
||||
timeChanged: function (e) {
|
||||
|
||||
var cal = $(e.target).closest('.calendar'),
|
||||
var cal = $(e.target).closest('.calendar'),
|
||||
isLeft = cal.hasClass('left');
|
||||
|
||||
var hour = parseInt(cal.find('.hourselect').val(), 10);
|
||||
@@ -1500,7 +1505,7 @@
|
||||
|
||||
},
|
||||
|
||||
formInputsChanged: function(e) {
|
||||
formInputsChanged: function (e) {
|
||||
var isRight = $(e.target).closest('.calendar').hasClass('right');
|
||||
var start = moment(this.container.find('input[name="daterangepicker_start"]').val(), this.locale.format);
|
||||
var end = moment(this.container.find('input[name="daterangepicker_end"]').val(), this.locale.format);
|
||||
@@ -1524,7 +1529,7 @@
|
||||
this.updateView();
|
||||
},
|
||||
|
||||
formInputsFocused: function(e) {
|
||||
formInputsFocused: function (e) {
|
||||
|
||||
// Highlight the focused input
|
||||
this.container.find('input[name="daterangepicker_start"], input[name="daterangepicker_end"]').removeClass('active');
|
||||
@@ -1544,7 +1549,7 @@
|
||||
|
||||
},
|
||||
|
||||
formInputsBlurred: function(e) {
|
||||
formInputsBlurred: function (e) {
|
||||
|
||||
// this function has one purpose right now: if you tab from the first
|
||||
// text input to the second in the UI, the endDate is nulled so that
|
||||
@@ -1562,14 +1567,14 @@
|
||||
|
||||
},
|
||||
|
||||
elementChanged: function() {
|
||||
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,
|
||||
end = null;
|
||||
start = null,
|
||||
end = null;
|
||||
|
||||
if (dateString.length === 2) {
|
||||
start = moment(dateString[0], this.locale.format);
|
||||
@@ -1588,14 +1593,14 @@
|
||||
this.updateView();
|
||||
},
|
||||
|
||||
keydown: function(e) {
|
||||
keydown: function (e) {
|
||||
//hide on tab or enter
|
||||
if ((e.keyCode === 9) || (e.keyCode === 13)) {
|
||||
this.hide();
|
||||
}
|
||||
},
|
||||
|
||||
updateElement: function() {
|
||||
updateElement: function () {
|
||||
if (this.element.is('input') && !this.singleDatePicker && this.autoUpdateInput) {
|
||||
this.element.val(this.startDate.format(this.locale.format) + this.locale.separator + this.endDate.format(this.locale.format));
|
||||
this.element.trigger('change');
|
||||
@@ -1605,7 +1610,7 @@
|
||||
}
|
||||
},
|
||||
|
||||
remove: function() {
|
||||
remove: function () {
|
||||
this.container.remove();
|
||||
this.element.off('.daterangepicker');
|
||||
this.element.removeData();
|
||||
@@ -1613,8 +1618,8 @@
|
||||
|
||||
};
|
||||
|
||||
$.fn.daterangepicker = function(options, callback) {
|
||||
this.each(function() {
|
||||
$.fn.daterangepicker = function (options, callback) {
|
||||
this.each(function () {
|
||||
var el = $(this);
|
||||
if (el.data('daterangepicker'))
|
||||
el.data('daterangepicker').remove();
|
||||
|
||||
Reference in New Issue
Block a user