CSR-762 Fix keyboard navigation
This commit is contained in:
parent
f7ab4ab503
commit
ccab154426
1 changed files with 52 additions and 49 deletions
|
|
@ -2,6 +2,7 @@
|
|||
<label
|
||||
:class="[buttonWrapperClasses, { 'has-error': errors.length > 0 }]"
|
||||
:for="buttonId"
|
||||
@mousedown.left="handleEventAction('click', $event)"
|
||||
>
|
||||
selectOnKeypress: {{ selectOnKeypress }}
|
||||
<!-- classes: {{classes}}<br/>
|
||||
|
|
@ -102,57 +103,59 @@ export default {
|
|||
hasFirstEventFired: this.hasFirstEventFired,
|
||||
});
|
||||
|
||||
switch (eventType) {
|
||||
case eventTypes.CLICK:
|
||||
case eventTypes.KEYPRESS_SUBMIT:
|
||||
console.log("clicking");
|
||||
this.hasFirstEventFired = true;
|
||||
this.handleClick(e);
|
||||
break;
|
||||
case eventTypes.CHANGE:
|
||||
console.log("selectOnKeypress: ", this.selectOnKeypress);
|
||||
this.hasFirstEventFired = false;
|
||||
this.selectOnKeypress
|
||||
? this.handleClick(e)
|
||||
: this.handleSelectionChange(e);
|
||||
break;
|
||||
}
|
||||
|
||||
// if (this.isMultiSelect) {
|
||||
// // if (true) {
|
||||
// switch (eventType) {
|
||||
// case eventTypes.CLICK:
|
||||
// case eventTypes.KEYPRESS_SUBMIT:
|
||||
// console.log("clicking");
|
||||
// this.hasFirstEventFired = true;
|
||||
// this.handleClick(e);
|
||||
// break;
|
||||
// case eventTypes.CHANGE:
|
||||
// console.log("selectOnKeypress: ", this.selectOnKeypress);
|
||||
// this.hasFirstEventFired = false;
|
||||
// this.selectOnKeypress
|
||||
// ? this.handleClick(e)
|
||||
// : this.handleSelectionChange(e);
|
||||
// break;
|
||||
// }
|
||||
// } else {
|
||||
// switch (eventType) {
|
||||
// case eventTypes.CLICK:
|
||||
// case eventTypes.KEYPRESS_SUBMIT:
|
||||
// console.log("clicking");
|
||||
// this.hasFirstEventFired = true;
|
||||
// this.handleClick(e);
|
||||
// break;
|
||||
// case eventTypes.CHANGE:
|
||||
// console.log("selectOnKeypress: ", this.selectOnKeypress);
|
||||
// this.hasFirstEventFired = false;
|
||||
// this.selectOnKeypress
|
||||
// ? this.handleClick(e)
|
||||
// : this.handleSelectionChange(e);
|
||||
// break;
|
||||
// }
|
||||
// switch (eventType) {
|
||||
// case eventTypes.CLICK:
|
||||
// case eventTypes.KEYPRESS_SUBMIT:
|
||||
// console.log("clicking");
|
||||
// this.hasFirstEventFired = true;
|
||||
// this.handleClick(e);
|
||||
// break;
|
||||
// case eventTypes.CHANGE:
|
||||
// console.log("selectOnKeypress: ", this.selectOnKeypress);
|
||||
// this.hasFirstEventFired = false;
|
||||
// this.selectOnKeypress
|
||||
// ? this.handleClick(e)
|
||||
// : this.handleSelectionChange(e);
|
||||
// break;
|
||||
// }
|
||||
|
||||
if (this.isMultiSelect) {
|
||||
// if (true) {
|
||||
switch (eventType) {
|
||||
// case eventTypes.CLICK:
|
||||
case eventTypes.KEYPRESS_SUBMIT:
|
||||
console.log("clicking");
|
||||
// this.hasFirstEventFired = true;
|
||||
this.handleClick(e);
|
||||
break;
|
||||
case eventTypes.CHANGE:
|
||||
console.log("selectOnKeypress: ", this.selectOnKeypress);
|
||||
// this.hasFirstEventFired = false;
|
||||
this.selectOnKeypress
|
||||
? this.handleClick(e)
|
||||
: this.handleSelectionChange(e);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
switch (eventType) {
|
||||
case eventTypes.CLICK:
|
||||
case eventTypes.KEYPRESS_SUBMIT:
|
||||
console.log("clicking");
|
||||
|
||||
// TODO KO may still need this since GA events, wouldn't want to trigger twice
|
||||
// this.hasFirstEventFired = true;
|
||||
this.handleClick(e);
|
||||
break;
|
||||
case eventTypes.CHANGE:
|
||||
console.log("selectOnKeypress: ", this.selectOnKeypress);
|
||||
// this.hasFirstEventFired = false;
|
||||
this.selectOnKeypress
|
||||
? this.handleClick(e)
|
||||
: this.handleSelectionChange(e);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// if (!this.hasFirstEventFired) {
|
||||
|
||||
// else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue