diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 19:14:40 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 19:14:40 +0000 |
| commit | 09d2da20913757e5350c711ec9e20df94b022584 (patch) | |
| tree | e90db7591afee6f35cca4062732987436876e164 | |
| parent | 4c59557f94a3323d4dc1b554a9949b599a9121cb (diff) | |
| parent | ea7114541838652fe3e6dcf3bdc4c3812f013e7b (diff) | |
| download | gitlab-ce-09d2da20913757e5350c711ec9e20df94b022584.tar.gz | |
Merge branch 'dropdown-filter-select' into 'master'
Fixed issue with multi select not working with arrow keys
See merge request !3792
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 10 |
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 |