vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Merge pull request #2594 from tugcekucukoglu/calendar 

Update Calendar.vue
pull/2595/head
Tuğçe Küçükoğlu 2022-05-31 14:54:37 +03:00 committed by GitHub
parent 13e3e0ec29 a8e400da03
commit bb6dcfb7d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/calendar/Calendar.vue
View File

@ -440,7 +440,7 @@ export default {
return selected; return selected;
} }
else if( this.isRangeSelection()) { else if (this.isRangeSelection()) {
if (this.modelValue[1]) if (this.modelValue[1])
return this.isDateEquals(this.modelValue[0], dateMeta) || this.isDateEquals(this.modelValue[1], dateMeta) || this.isDateBetween(this.modelValue[0], this.modelValue[1], dateMeta); return this.isDateEquals(this.modelValue[0], dateMeta) || this.isDateEquals(this.modelValue[1], dateMeta) || this.isDateBetween(this.modelValue[0], this.modelValue[1], dateMeta);
else { else {
@ -1706,9 +1706,10 @@ export default {
} }
date = this.daylightSavingAdjust(new Date(year, month - 1, day)); date = this.daylightSavingAdjust(new Date(year, month - 1, day));
if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
throw "Invalid date"; // E.g. 31/02/00 if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
} throw "Invalid date"; // E.g. 31/02/00
}
return date; return date;
}, },
@ -2193,7 +2194,7 @@ export default {
this.focused = false; this.focused = false;
this.input.value = this.formatValue(this.modelValue); this.input.value = this.formatValue(this.modelValue);
}, },
onKeyDown() { onKeyDown(event) {
if (event.keyCode === 40 && this.overlay) { if (event.keyCode === 40 && this.overlay) {
this.trapFocus(event); this.trapFocus(event);
} }
@ -2290,21 +2291,26 @@ export default {
if (propValue && Array.isArray(propValue)) { if (propValue && Array.isArray(propValue)) {
if (this.isRangeSelection()) { if (this.isRangeSelection()) {
propValue = propValue[1] || propValue[0]; propValue = propValue[1] || propValue[0];
} else if (this.isMultipleSelection()) { }
else if (this.isMultipleSelection()) {
propValue = propValue[propValue.length - 1]; propValue = propValue[propValue.length - 1];
} }
} }
if (propValue && typeof propValue !== 'string') { if (propValue && typeof propValue !== 'string') {
return propValue; return propValue;
} else { }
else {
let today = new Date(); let today = new Date();
if (this.maxDate && this.maxDate < today) { if (this.maxDate && this.maxDate < today) {
return this.maxDate; return this.maxDate;
} }
if (this.minDate && this.minDate > today) { if (this.minDate && this.minDate > today) {
return this.minDate; return this.minDate;
} }
return today; return today;
} }
}, },