8000 Issue when specifying stepHour/stepMinute/stepSecond along with min a… · saruman/jQuery-Timepicker-Addon@ed10d06 · GitHub
Skip to content

Commit ed10d06

Browse files
author
Ing. Jan Novotný
committed
Issue when specifying stepHour/stepMinute/stepSecond along with min and max limits. Modulo was computed in relation with midnight instead of min limit. Error usecase:
$('#example1').datetimepicker({ stepHour: 4, hourMin: 9, hourMax: 18 }); Would make steps 9-13-16 instead of 9-13-17.
1 parent 5cf7448 commit ed10d06

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎jquery-ui-timepicker-addon.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ $.extend(Timepicker.prototype, {
340340
// Added by Peter Medeiros:
341341
// - Figure out what the hour/minute/second max should be based on the step values.
342342
// - Example: if stepMinute is 15, then minMax is 45.
343-
hourMax = (o.hourMax - (o.hourMax % o.stepHour)).toFixed(0),
344-
minMax = (o.minuteMax - (o.minuteMax % o.stepMinute)).toFixed(0),
345-
secMax = (o.secondMax - (o.secondMax % o.stepSecond)).toFixed(0),
346-
millisecMax = (o.millisecMax - (o.millisecMax % o.stepMillisec)).toFixed(0),
343+
hourMax = (o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)).toFixed(0),
344+
minMax = (o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)).toFixed(0),
345+
secMax = (o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)).toFixed(0),
346+
millisecMax = (o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)).toFixed(0),
347347
dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
348348

349349
// Prevent displaying twice
@@ -362,7 +362,7 @@ $.extend(Timepicker.prototype, {
362362
secondGridSize = 0,
363363
millisecGridSize = 0,
364364
size;
365-
365+
366366
// Hours
367367
if (o.showHour && o.hourGrid > 0) {
368368
html += '<dd class="ui_tpicker_hour">' +
@@ -388,7 +388,7 @@ $.extend(Timepicker.prototype, {
388388

389389
html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
390390
((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>';
391-
391+
392392
// Minutes
393393
if (o.showMinute && o.minuteGrid > 0) {
394394
html += '<dd class="ui_tpicker_minute ui_tpicker_minute_' + o.minuteGrid + '">' +
@@ -425,7 +425,7 @@ $.extend(Timepicker.prototype, {
425425
'</dd>';
426426
} else html += '<dd class="ui_tpicker_second" id="ui_tpicker_second_' + dp_id + '"' +
427427
((o.showSecond) ? '' : noDisplay) + '></dd>';
428-
428+
429429
// Milliseconds
430430
html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
431431
((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>';
@@ -445,8 +445,8 @@ $.extend(Timepicker.prototype, {
445445
'</dd>';
446446
} else html += '<dd class="ui_tpicker_millisec" id="ui_tpicker_millisec_' + dp_id + '"' +
447447
((o.showMillisec) ? '' : noDisplay) + '></dd>';
448-
449-
// Timezone
448+
449+
// Timezone
450450
html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
451451
((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
452452
html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"' +
@@ -502,7 +502,7 @@ $.extend(Timepicker.prototype, {
502502
tp_inst._onTimeChange();
503503
}
504504
});
505-
505+
506506
this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
507507
orientation: "horizontal",
508508
value: this.millisec,
@@ -514,7 +514,7 @@ $.extend(Timepicker.prototype, {
514514
tp_inst._onTimeChange();
515515
}
516516
});
517-
517+
518518
this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
519519
$.fn.append.apply(this.timezone_select,
520520
$.map(o.timezoneList, function(val, idx) {
@@ -598,7 +598,7 @@ $.extend(Timepicker.prototype, {
598598
});
599599
});
600600
}
601-
601+
602602
if (o.showMillisec && o.millisecGrid > 0) {
603603
$tp.find(".ui_tpicker_millisec table").css({
604604
width: size + "%",
@@ -642,7 +642,7 @@ $.extend(Timepicker.prototype, {
642642
},
643643

644644
//########################################################################
645-
// This function tries to limit the ability to go outside the
645+
// This function tries to limit the ability to go outside the
646646
// min/max date range
647647
//########################################################################
648648
_limitMinMaxDateTime: function(dp_inst, adjustSliders){
@@ -674,7 +674,7 @@ $.extend(Timepicker.prototype, {
674674
this.second = this._defaults.secondMin;
675675
this._defaults.millisecMin = minDateTime.getMilliseconds();
676676
} else {
677-
if(this.millisec < this._defaults.millisecMin)
677+
if(this.millisec < this._defaults.millisecMin)
678678
this.millisec = this._defaults.millisecMin;
679679
this._defaults.millisecMin = this.millisecMinOriginal;
680680
}
@@ -694,7 +694,7 @@ $.extend(Timepicker.prototype, {
694694
if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
695695
var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
696696
maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
697-
697+
698698
if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
699699
this.hourMaxOriginal = o.hourMax;
700700
this.minuteMaxOriginal = o.minuteMax;
@@ -731,10 +731,10 @@ $.extend(Timepicker.prototype, {
731731
}
732732

733733
if(adjustSliders !== undefined && adjustSliders === true){
734-
var hourMax = (this._defaults.hourMax - (this._defaults.hourMax % this._defaults.stepHour)).toFixed(0),
735-
minMax = (this._defaults.minuteMax - (this._defaults.minuteMax % this._defaults.stepMinute)).toFixed(0),
736-
secMax = (this._defaults.secondMax - (this._defaults.secondMax % this._defaults.stepSecond)).toFixed(0),
737-
millisecMax = (this._defaults.millisecMax - (this._defaults.millisecMax % this._defaults.stepMillisec)).toFixed(0);
734+
var hourMax = (this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)).toFixed(0),
735+
minMax = (this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)).toFixed(0),
736+
secMax = (this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)).toFixed(0),
737+
millisecMax = (this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)).toFixed(0);
738738

739739
if(this.hour_slider)
740740
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);

0 commit comments

Comments
 (0)