kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add timeout for ajax call in award emoji steps; update focus in award picker

This commit is contained in:
Annabel Dunstone 2016-02-19 07:32:20 -06:00
parent 074fa8f2b9
commit b80df08735
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/awards_handler.coffee
View File

@ -5,7 +5,6 @@ class @AwardsHandler
event.preventDefault() event.preventDefault()
@showEmojiMenu() @showEmojiMenu()
$("#emoji_search").focus()
$("html").on 'click', (event) -> $("html").on 'click', (event) ->
if !$(event.target).closest(".emoji-menu").length if !$(event.target).closest(".emoji-menu").length
@ -18,10 +17,12 @@ class @AwardsHandler
showEmojiMenu: -> showEmojiMenu: ->
if $(".emoji-menu").length if $(".emoji-menu").length
$(".emoji-menu").show() $(".emoji-menu").show()
$("#emoji_search").focus()
else else
$.get "/emoji_menu", (response) -> $.get "/emoji_menu", (response) ->
$(".add-award").after response $(".add-award").after response
$(".emoji-menu").show() $(".emoji-menu").show()
$("#emoji_search").focus()
addAward: (emoji) -> addAward: (emoji) ->
emoji = @normilizeEmojiName(emoji) emoji = @normilizeEmojiName(emoji)

1
features/steps/project/issues/award_emoji.rb
View File

@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end end
step 'The search field is focused' do step 'The search field is focused' do
sleep 0.8
page.evaluate_script("document.activeElement.id").should eq "emoji_search" page.evaluate_script("document.activeElement.id").should eq "emoji_search"
end end
end end