From 896b9c1dc80af349bab9681bb0c668de65151572 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 19 Jul 2016 19:52:40 +0100
Subject: [PATCH] Fixed issue with filtering & pressing enter key
---
app/assets/javascripts/gl_dropdown.js.coffee | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index bd814dd15a2..ab41caa28f8 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -311,6 +311,7 @@ class GitLabDropdown
return true
opened: =>
+ currentIndex = -1
@addArrowKeyEvent()
if @options.setIndeterminateIds
@@ -568,9 +569,6 @@ class GitLabDropdown
PREV_INDEX = currentIndex
$listItems = $(selector, @dropdown)
- # if @options.filterable
- # $input.blur()
-
if currentKeyCode is 40
# Move down
currentIndex += 1 if currentIndex < ($listItems.length - 1)
@@ -583,7 +581,7 @@ class GitLabDropdown
return false
if currentKeyCode is 13 and currentIndex isnt -1
- @selectRowAtIndex e, currentIndex
+ @selectRowAtIndex e, $('.is-focused', @dropdown).closest('li').index() - 1
removeArrayKeyEvent: ->
$('body').off 'keydown'
--
GitLab