mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-15 23:56:09 +10:00
Merge branch 'focus-emoji-search-field' into 'master'
Auto-focus emoji award search field  Closes #12621 cc. @jschatz1 See merge request !2650
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -9,6 +9,7 @@ Feature: Award Emoji
|
||||
@javascript
|
||||
Scenario: I add and remove award in the issue
|
||||
Given I click to emoji-picker
|
||||
Then The search field is focused
|
||||
And I click to emoji in the picker
|
||||
Then I have award added
|
||||
And I can remove it by clicking to icon
|
||||
@@ -16,11 +17,13 @@ Feature: Award Emoji
|
||||
@javascript
|
||||
Scenario: I can see the list of emoji categories
|
||||
Given I click to emoji-picker
|
||||
Then The search field is focused
|
||||
Then I can see the activity and food categories
|
||||
|
||||
@javascript
|
||||
Scenario: I can search emoji
|
||||
Given I click to emoji-picker
|
||||
Then The search field is focused
|
||||
And I search "hand"
|
||||
Then I see search result for "hand"
|
||||
|
||||
|
||||
@@ -66,4 +66,8 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
|
||||
expect(page).to have_selector '[data-emoji="raised_hand"]'
|
||||
end
|
||||
end
|
||||
|
||||
step 'The search field is focused' do
|
||||
page.evaluate_script("document.activeElement.id").should eq "emoji_search"
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user