deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-06-02 22:12:21 +02:00
Code Issues Projects Releases Wiki Activity

Resolve keycode issue

Browse source
This commit is contained in:
Josh Johnson 2017-07-20 12:05:56 +01:00
parent f862a3a055
commit fd52de1835
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assets/scripts/src/choices.js
View file

@ -1172,11 +1172,11 @@ class Choices {
// If we are clicking on an option // If we are clicking on an option
const id = element.getAttribute('data-id'); const id = element.getAttribute('data-id');
const choice = this.store.getChoiceById(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); const hasActiveDropdown = this.dropdown.classList.contains(this.config.classNames.activeState);
// Update choice keyCode // Update choice keyCode
choice.keyCode = passedKeyCode choice.keyCode = passedKeyCode;
triggerEvent(this.passedElement, 'choice', { triggerEvent(this.passedElement, 'choice', {
choice, choice,
@ -1590,7 +1590,9 @@ class Choices {
// If we have a highlighted choice // If we have a highlighted choice
if (highlighted) { if (highlighted) {
// add enter keyCode value // add enter keyCode value
activeItems[0].keyCode = enterKey if (activeItems[0]) {
activeItems[0].keyCode = enterKey;
}
this._handleChoiceAction(activeItems, highlighted); this._handleChoiceAction(activeItems, highlighted);
} }
@ -2132,7 +2134,7 @@ class Choices {
*/ */
_addItem(value, label = null, choiceId = -1, groupId = -1, customProperties = null, keyCode = null) { _addItem(value, label = null, choiceId = -1, groupId = -1, customProperties = null, keyCode = null) {
let passedValue = isType('String', value) ? value.trim() : value; let passedValue = isType('String', value) ? value.trim() : value;
let passedKeyCode = keyCode let passedKeyCode = keyCode;
const items = this.store.getItems(); const items = this.store.getItems();
const passedLabel = label || passedValue; const passedLabel = label || passedValue;
const passedOptionId = parseInt(choiceId, 10) || -1; const passedOptionId = parseInt(choiceId, 10) || -1;

2
index.html
View file

@ -25,7 +25,7 @@
<!-- Choices includes --> <!-- Choices includes -->
<link rel="stylesheet" href="assets/styles/css/choices.min.css?version=2.8.9"> <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 --> <!-- End Choices includes -->
<!--[if lt IE 9]> <!--[if lt IE 9]>