diff options
| author | Phil Hughes <me@iamphill.com> | 2016-01-29 12:15:58 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-01-29 12:15:58 +0000 |
| commit | 1b978727933e50ec4ddcd855f7f8a6216885ac4a (patch) | |
| tree | 39651fd251b7dcb129f070b17e421aa797a01bc5 /app | |
| parent | f5860ce6466bf8934bc01254351bffd005dfeafe (diff) | |
| download | gitlab-ce-1b978727933e50ec4ddcd855f7f8a6216885ac4a.tar.gz | |
Auto-focus emoji award search field
Closes #12621
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 1 | ||||
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 1ef31c7700e..047df4786a9 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -4,6 +4,7 @@ class @AwardsHandler event.stopPropagation() event.preventDefault() $(".emoji-menu").show() + $("#emoji_search").focus() $("html").on 'click', (event) -> if !$(event.target).closest(".emoji-menu").length diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index b1f8645eea0..91c5b7eac5e 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -7,7 +7,7 @@ - if current_user .awards-controls - %a.add-award{"data-toggle" => "dropdown", "data-target" => "#", "href" => "#"} + %a.add-award{"href" => "#"} = icon('smile-o') .emoji-menu .emoji-menu-content |