From af1ba235ed1e02f80c947070daf43e6fc0bb7759 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 17 Nov 2014 13:37:27 -0500 Subject: [PATCH] Remove input blur on selection, breaks tabbing in webkit based browsers #1253 --- src/definitions/modules/dropdown.js | 12 +++++++----- src/definitions/modules/dropdown.less | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 4e109f8ef..b914ba54b 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -390,6 +390,12 @@ $.fn.dropdown = function(parameters) { ; }, + focusSearch: function() { + $search + .focus() + ; + }, + event: { // prevents focus callback from occuring on mousedown mousedown: function() { @@ -451,17 +457,12 @@ $.fn.dropdown = function(parameters) { // close shortcuts if(pressedKey == keys.escape) { module.verbose('Escape key pressed, closing dropdown'); - $search.blur(); module.hide(); } // result shortcuts if(module.is.visible()) { if(pressedKey == keys.enter && hasSelectedItem) { module.verbose('Enter key pressed, choosing selected item'); - if(module.is.searchable()) { - module.verbose('Removing focus from search input'); - $search.blur(); - } $.proxy(module.event.item.click, $selectedItem)(event); event.preventDefault(); return false; @@ -1071,6 +1072,7 @@ $.fn.dropdown = function(parameters) { if( module.can.click() ) { module.unbind.intent(); } + module.focusSearch(); module.hideSubMenus(); module.remove.active(); } diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index ecd57c409..a58868ca4 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -498,7 +498,7 @@ select.ui.dropdown { .ui.search.dropdown.visible > input.search { cursor: auto; } -.ui.search.dropdown > input.search:focus + .text { +.ui.active.search.dropdown > input.search:focus + .text { color: @unselectedTextColor !important; }