Time Picker Check for #1744
parent
e7660089bb
commit
3355a3ad56
|
@ -309,6 +309,7 @@ export default {
|
||||||
style: null
|
style: null
|
||||||
},
|
},
|
||||||
navigationState: null,
|
navigationState: null,
|
||||||
|
timePickerChange: false,
|
||||||
scrollHandler: null,
|
scrollHandler: null,
|
||||||
outsideClickListener: null,
|
outsideClickListener: null,
|
||||||
maskClickListener: null,
|
maskClickListener: null,
|
||||||
|
@ -1298,6 +1299,7 @@ export default {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
},
|
},
|
||||||
updateModelTime() {
|
updateModelTime() {
|
||||||
|
this.timePickerChange = true;
|
||||||
let value = this.isComparable() ? this.modelValue : this.viewDate;
|
let value = this.isComparable() ? this.modelValue : this.viewDate;
|
||||||
|
|
||||||
if (this.isRangeSelection()) {
|
if (this.isRangeSelection()) {
|
||||||
|
@ -1334,6 +1336,7 @@ export default {
|
||||||
|
|
||||||
this.updateModel(value);
|
this.updateModel(value);
|
||||||
this.$emit('date-select', value);
|
this.$emit('date-select', value);
|
||||||
|
setTimeout(() => this.timePickerChange = false, 0);
|
||||||
},
|
},
|
||||||
toggleAMPM(event) {
|
toggleAMPM(event) {
|
||||||
this.pm = !this.pm;
|
this.pm = !this.pm;
|
||||||
|
@ -2083,7 +2086,7 @@ export default {
|
||||||
if (cell) {
|
if (cell) {
|
||||||
cell.tabIndex = '0';
|
cell.tabIndex = '0';
|
||||||
|
|
||||||
if (!this.navigationState || !this.navigationState.button) {
|
if ((!this.navigationState || !this.navigationState.button) && !this.timePickerChange) {
|
||||||
cell.focus();
|
cell.focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue