Skip to content

sync with original smalot datetimepicker hours/minutes disabling #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

sync with original smalot datetimepicker hours/minutes disabling #1080

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e48c9
sync with original smalot datetimepicker: hoursDisabled and minutesDi…
nnmer Jun 19, 2015
34f5949
some indentation corrections
nnmer Jun 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions Resources/public/components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@

this.bootcssVer = this.isInput ? (this.element.is('.form-control') ? 3 : 2) : ( this.bootcssVer = this.element.is('.input-group') ? 3 : 2 );

this.component = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar, .input-group-addon .fa-th, .input-group-addon .fa-clock-o,.input-group-addon .fa-calendar, .input-group-addon .fa-calendar-o').parent() : this.element.find('.add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar').parent()) : false;
this.componentReset = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-remove,.input-group-addon .fa-remove').parent() : this.element.find('.add-on .icon-remove').parent()) : false;
this.component = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-th, .input-group-addon .glyphicon-time, .input-group-addon .glyphicon-calendar, .input-group-addon .fa-th, .input-group-addon .fa-clock-o,.input-group-addon .fa-calendar, .input-group-addon .fa-calendar-o').parent() : this.element.find('.add-on .icon-th, .add-on .icon-time, .add-on .icon-calendar').parent()) : false;
this.componentReset = this.element.is('.date') ? ( this.bootcssVer == 3 ? this.element.find('.input-group-addon .glyphicon-remove,.input-group-addon .fa-remove').parent() : this.element.find('.add-on .icon-remove').parent()) : false;
this.hasInput = this.component && this.element.find('input').length;
if (this.component && this.component.length === 0) {
this.component = false;
Expand Down Expand Up @@ -168,7 +168,7 @@
this.picker.find('.prev i, .next i')
.toggleClass('icon-arrow-left icon-arrow-right');
}
}
}
$(document).on('mousedown', function (e) {
// Clicked outside the datetimepicker, hide it
if ($(e.target).closest('.datetimepicker').length === 0) {
Expand Down Expand Up @@ -201,6 +201,8 @@
this.setStartDate(options.startDate || this.element.data('date-startdate'));
this.setEndDate(options.endDate || this.element.data('date-enddate'));
this.setDaysOfWeekDisabled(options.daysOfWeekDisabled || this.element.data('date-days-of-week-disabled'));
this.setMinutesDisabled(options.minutesDisabled || this.element.data('date-minute-disabled'));
this.setHoursDisabled(options.hoursDisabled || this.element.data('date-hour-disabled'));
this.fillDow();
this.fillMonths();
this.update();
Expand Down Expand Up @@ -415,6 +417,30 @@
this.updateNavArrows();
},

setMinutesDisabled: function (minutesDisabled) {
this.minutesDisabled = minutesDisabled || [];
if (!$.isArray(this.minutesDisabled)) {
this.minutesDisabled = this.minutesDisabled.split(/,\s*/);
}
this.minutesDisabled = $.map(this.minutesDisabled, function (d) {
return parseInt(d, 10);
});
this.update();
this.updateNavArrows();
},

setHoursDisabled: function (hoursDisabled) {
this.hoursDisabled = hoursDisabled || [];
if (!$.isArray(this.hoursDisabled)) {
this.hoursDisabled = this.hoursDisabled.split(/,\s*/);
}
this.hoursDisabled = $.map(this.hoursDisabled, function (d) {
return parseInt(d, 10);
});
this.update();
this.updateNavArrows();
},

place: function () {
if (this.isInline) return;

Expand Down Expand Up @@ -580,7 +606,9 @@

html = [];
var txt = '', meridian = '', meridianOld = '';
var hoursDisabled = this.hoursDisabled || [];
for (var i = 0; i < 24; i++) {
if (hoursDisabled.indexOf(i) !== -1) continue;
var actual = UTCDate(year, month, dayMonth, i);
clsName = '';
// We want the previous hour for the startDate
Expand Down Expand Up @@ -612,7 +640,9 @@

html = [];
txt = '', meridian = '', meridianOld = '';
var minutesDisabled = this.minutesDisabled || [];
for (var i = 0; i < 60; i += this.minuteStep) {
if (minutesDisabled.indexOf(i) !== -1) continue;
var actual = UTCDate(year, month, dayMonth, hours, i, 0);
clsName = '';
if (actual.valueOf() < this.startDate || actual.valueOf() > this.endDate) {
Expand Down