Skip to content

Commit

Permalink
Resolve keycode issue
Browse files Browse the repository at this point in the history
  • Loading branch information
jshjohnson committed Jul 20, 2017
1 parent f862a3a commit fd52de1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions assets/scripts/src/choices.js
Original file line number Diff line number Diff line change
Expand Up @@ -1172,11 +1172,11 @@ class Choices {
// If we are clicking on an option
const id = element.getAttribute('data-id');
const choice = this.store.getChoiceById(id);
const passedKeyCode = activeItems[0].keyCode !== null ? activeItems[0].keyCode : null
const passedKeyCode = activeItems[0] && activeItems[0].keyCode ? activeItems[0].keyCode : null;
const hasActiveDropdown = this.dropdown.classList.contains(this.config.classNames.activeState);

// Update choice keyCode
choice.keyCode = passedKeyCode
choice.keyCode = passedKeyCode;

triggerEvent(this.passedElement, 'choice', {
choice,
Expand Down Expand Up @@ -1590,7 +1590,9 @@ class Choices {
// If we have a highlighted choice
if (highlighted) {
// add enter keyCode value
activeItems[0].keyCode = enterKey
if (activeItems[0]) {
activeItems[0].keyCode = enterKey;
}
this._handleChoiceAction(activeItems, highlighted);
}

Expand Down Expand Up @@ -2132,7 +2134,7 @@ class Choices {
*/
_addItem(value, label = null, choiceId = -1, groupId = -1, customProperties = null, keyCode = null) {
let passedValue = isType('String', value) ? value.trim() : value;
let passedKeyCode = keyCode
let passedKeyCode = keyCode;
const items = this.store.getItems();
const passedLabel = label || passedValue;
const passedOptionId = parseInt(choiceId, 10) || -1;
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<!-- Choices includes -->
<link rel="stylesheet" href="assets/styles/css/choices.min.css?version=2.8.9">
<script src="assets/scripts/dist/choices.js?version=2.8.9"></script>
<script src="assets/scripts/dist/choices.min.js?version=2.8.8"></script>
<!-- End Choices includes -->

<!--[if lt IE 9]>
Expand Down

0 comments on commit fd52de1

Please sign in to comment.