summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-18 16:45:49 +0100
committerPhil Hughes <me@iamphill.com>2016-04-18 16:45:49 +0100
commitea7114541838652fe3e6dcf3bdc4c3812f013e7b (patch)
tree6c3c726d0b474f5b240c275f1786c730b6358640
parent4d5d61945770378d6c0edbdfe0e88d43c5129b03 (diff)
downloadgitlab-ce-dropdown-filter-select.tar.gz
Fixed issue with multi select not working with arrow keysdropdown-filter-select
-rw-r--r--app/assets/javascripts/gl_dropdown.js.coffee10
1 files changed, 2 insertions, 8 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 2dc37257e22..fac928ef202 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -32,10 +32,8 @@ class GitLabDropdownFilter
else if @input.val() is "" and $inputContainer.hasClass HAS_VALUE_CLASS
$inputContainer.removeClass HAS_VALUE_CLASS
- if keyCode is 13 and @input.val() isnt ""
- if @options.enterCallback
- @options.enterCallback()
- return
+ if keyCode is 13
+ return false
clearTimeout timeout
timeout = setTimeout =>
@@ -132,7 +130,6 @@ class GitLabDropdown
@filterInput = @getElement(FILTER_INPUT)
@highlight = false
@filterInputBlur = true
- @enterCallback = true
} = @options
self = @
@@ -178,9 +175,6 @@ class GitLabDropdown
callback: (data) =>
currentIndex = -1
@parseData data
- enterCallback: =>
- if @enterCallback
- @selectRowAtIndex 0
# Event listeners