diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 19:40:55 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 19:40:55 +0300 |
| commit | 7b6fe0e25933243c2dd2826a592f4239c862dc9d (patch) | |
| tree | a47508da8baeeb57426b41936a6feec08efb0e21 /app/assets/javascripts/gl_dropdown.js.coffee | |
| parent | e784958cb5396d745e43797988bacf9c9a27e9f4 (diff) | |
| parent | 364354bce442e2058491e549bbacfbea0c007c0d (diff) | |
Merge remote-tracking branch 'origin/master' into label-dropdown-fix
# Conflicts:
# app/views/shared/issuable/_sidebar.html.haml
Diffstat (limited to 'app/assets/javascripts/gl_dropdown.js.coffee')
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index 398d3ba4dc8..6ebecf72329 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 = @ @@ -157,6 +154,9 @@ class GitLabDropdown @fullData = data @parseData @fullData + + if @options.filterable + @filterInput.trigger 'keyup' } # Init filterable @@ -178,9 +178,6 @@ class GitLabDropdown callback: (data) => currentIndex = -1 @parseData data - enterCallback: => - if @enterCallback - @selectRowAtIndex 0 # Event listeners |