diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-11 17:06:31 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-11 17:06:31 +0100 |
| commit | e0f3b66c38e574e084e0448a7fdd5430ba58fbda (patch) | |
| tree | 20b3b49a8f4dbb780412b0a2df258bf4f1f6e37f | |
| parent | 359ec42754d74206140e8e0c4bb0129e15f824d7 (diff) | |
| download | gitlab-ce-lbennett/gitlab-ce-18120-focus-filter-shortcut.tar.gz | |
Review changeslbennett/gitlab-ce-18120-focus-filter-shortcut
| -rw-r--r-- | app/assets/javascripts/projects_list.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/shortcuts.js.coffee | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee index 9d34aebbf02..a7d78d9e461 100644 --- a/app/assets/javascripts/projects_list.js.coffee +++ b/app/assets/javascripts/projects_list.js.coffee @@ -6,9 +6,9 @@ initSearch: -> projectsListFilter = $('.projects-list-filter') - projectsListFilter.on 'keyup', (e) => - clearTimeout(@timer) if @timer - @timer = setTimeout(ProjectsList.filterResults, 500) if projectsListFilter.val() isnt '' + debounceFilter = _.debounce ProjectsList.filterResults, 500 + projectsListFilter.on 'keyup', (e) -> + debounceFilter() if projectsListFilter.val() isnt '' filterResults: -> $('.projects-list-holder').fadeTo(250, 0.5) diff --git a/app/assets/javascripts/shortcuts.js.coffee b/app/assets/javascripts/shortcuts.js.coffee index 04eba43d54c..8c8689bacee 100644 --- a/app/assets/javascripts/shortcuts.js.coffee +++ b/app/assets/javascripts/shortcuts.js.coffee @@ -2,10 +2,10 @@ class @Shortcuts constructor: (skipResetBindings) -> @enabledHelp = [] Mousetrap.reset() if not skipResetBindings - Mousetrap.bind('?', @onToggleHelp) - Mousetrap.bind('s', Shortcuts.focusSearch) - Mousetrap.bind 'f', @focusFilter - Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], @toggleMarkdownPreview) + Mousetrap.bind '?', @onToggleHelp + Mousetrap.bind 's', Shortcuts.focusSearch + Mousetrap.bind 'f', (e) => @focusFilter e + Mousetrap.bind ['ctrl+shift+p', 'command+shift+p'], @toggleMarkdownPreview Mousetrap.bind('t', -> Turbolinks.visit(findFileURL)) if findFileURL? onToggleHelp: (e) => @@ -34,7 +34,8 @@ class @Shortcuts ) focusFilter: (e) -> - $('input[type=search]', '.nav-controls .block-controls').focus() + @filterInput ?= $('input[type=search]', '.nav-controls') + @filterInput.focus() e.preventDefault() @focusSearch: (e) -> |