From fe7a2468336fa9926a547016c4643def8ff743cd Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Sun, 13 Sep 2015 15:32:47 -0400 Subject: [PATCH] #3016 fix comma not delimiting correctly --- src/definitions/modules/dropdown.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 20b44af23..5b5a11fe1 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -1152,6 +1152,7 @@ $.fn.dropdown = function(parameters) { hasSubMenu = ($subMenu.length> 0), hasSelectedItem = ($selectedItem.length > 0), selectedIsSelectable = ($selectedItem.not(selector.unselectable).length > 0), + delimiterPressed = (pressedKey == keys.delimiter && settings.allowAdditions && module.is.multiple()), $nextItem, isSubMenuItem, newIndex @@ -1161,7 +1162,7 @@ $.fn.dropdown = function(parameters) { if( module.is.visible() ) { // enter (select or open sub-menu) - if(pressedKey == keys.enter) { + if(pressedKey == keys.enter || delimiterPressed) { if(pressedKey == keys.enter && hasSelectedItem && hasSubMenu && !settings.allowCategorySelection) { module.verbose('Pressed enter on unselectable category, opening sub menu'); pressedKey = keys.rightArrow; @@ -1278,7 +1279,7 @@ $.fn.dropdown = function(parameters) { } else { // delimiter key - if(pressedKey == keys.delimiter && settings.allowAdditions && module.is.multiple()) { + if(delimiterPressed) { event.preventDefault(); } // down arrow (open menu)