Skip to content
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

Fix #6047: DatePicker round stepMinute correctly #6048

Merged
merged 4 commits into from
Jun 18, 2020
Merged

Fix #6047: DatePicker round stepMinute correctly #6048

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5025a1c
Fix #6047: DatePicker round stepMinute correctly
melloware Jun 17, 2020
4d1424a
Fix #6047: DatePicker round stepMinute correctly
melloware Jun 18, 2020
eb88669
Fix #6047: DatePicker round stepMinute correctly
melloware Jun 18, 2020
3c271c1
Fix #6047: DatePicker round stepMinute correctly
melloware Jun 18, 2020
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
31 changes: 27 additions & 4 deletions src/main/resources/META-INF/resources/primefaces/datepicker/0-datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@
viewDateDefaultsToNow = true;
}
}

// #6047 round to nearest stepMinute on even if editing using keyboard
this.viewDate.setMinutes(this.stepMinute(this.viewDate.getMinutes()));
if (!this.options.viewDate) {
this.options.viewDate = this.viewDate;
}

this.options.minDate = this.parseMinMaxValue(this.options.minDate);
this.options.maxDate = this.parseMinMaxValue(this.options.maxDate);
this.ticksTo1970 = (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) + Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000);
Expand Down Expand Up @@ -971,7 +978,7 @@

var time = this.parseTime(timeString, ampm);
value.setHours(time.hour);
value.setMinutes(time.minute);
value.setMinutes(this.stepMinute(time.minute));
if (this.options.showSeconds) {
value.setSeconds(time.second);
}
Expand Down Expand Up @@ -2127,7 +2134,7 @@
if (this.options.showTime) {
var time = (this.value && this.value instanceof Date) ? this.value : new Date();
date.setHours(time.getHours());
date.setMinutes(time.getMinutes());
date.setMinutes(this.stepMinute(time.getMinutes()));
date.setSeconds(time.getSeconds());
date.setMilliseconds(0);
}
Expand Down Expand Up @@ -2200,7 +2207,7 @@
incrementMinute: function (event) {
var currentTime = (this.value && this.value instanceof Date) ? this.value : this.viewDate,
currentMinute = currentTime.getMinutes(),
newMinute = currentMinute + this.options.stepMinute;
newMinute = this.stepMinute(currentMinute, this.options.stepMinute);
newMinute = (newMinute > 59) ? (newMinute - 60) : newMinute;

if (this.validateTime(currentTime.getHours(), newMinute, currentTime.getSeconds(), currentTime, "INCREMENT")) {
Expand All @@ -2213,7 +2220,7 @@
decrementMinute: function (event) {
var currentTime = (this.value && this.value instanceof Date) ? this.value : this.viewDate,
currentMinute = currentTime.getMinutes(),
newMinute = currentMinute - this.options.stepMinute;
newMinute = this.stepMinute(currentMinute, -this.options.stepMinute);
newMinute = (newMinute < 0) ? (newMinute + 60) : newMinute;

if (this.validateTime(currentTime.getHours(), newMinute, currentTime.getSeconds(), currentTime, "DECREMENT")) {
Expand All @@ -2223,6 +2230,22 @@
event.preventDefault();
},

stepMinute: function(currentMinute, step) {
if (this.options.stepMinute <= 1) {
return currentMinute;
}
if (!step) {
step = this.options.stepMinute;
if (currentMinute % step === 0) {
return currentMinute;
}
}

var newMinute = currentMinute + step;
newMinute = Math.floor(newMinute / step) * step;
return newMinute;
},

incrementSecond: function (event) {
var currentTime = (this.value && this.value instanceof Date) ? this.value : this.viewDate,
currentSecond = currentTime.getSeconds(),
Expand Down