diff options
| author | Annabel Dunstone <a.dunstone89@gmail.com> | 2016-02-19 07:32:20 -0600 |
|---|---|---|
| committer | Annabel Dunstone <a.dunstone89@gmail.com> | 2016-02-19 07:32:20 -0600 |
| commit | b80df0873524825a3dedc9d35427941db94c8ab7 (patch) | |
| tree | a66b3adf155ae1262906c6c656d2616aceeaf1a7 | |
| parent | 074fa8f2b94bbd3039da96819b5f0e615274a101 (diff) | |
| download | gitlab-ce-b80df0873524825a3dedc9d35427941db94c8ab7.tar.gz | |
Add timeout for ajax call in award emoji steps; update focus in award picker
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 3 | ||||
| -rw-r--r-- | features/steps/project/issues/award_emoji.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index a0009141c27..8e0e64b8949 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -5,7 +5,6 @@ class @AwardsHandler event.preventDefault() @showEmojiMenu() - $("#emoji_search").focus() $("html").on 'click', (event) -> if !$(event.target).closest(".emoji-menu").length @@ -18,10 +17,12 @@ class @AwardsHandler showEmojiMenu: -> if $(".emoji-menu").length $(".emoji-menu").show() + $("#emoji_search").focus() else $.get "/emoji_menu", (response) -> $(".add-award").after response $(".emoji-menu").show() + $("#emoji_search").focus() addAward: (emoji) -> emoji = @normilizeEmojiName(emoji) diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb index 93cf608cc62..ff9677ba972 100644 --- a/features/steps/project/issues/award_emoji.rb +++ b/features/steps/project/issues/award_emoji.rb @@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps end step 'The search field is focused' do + sleep 0.8 page.evaluate_script("document.activeElement.id").should eq "emoji_search" end end |