emoji picker search
This commit is contained in:
parent
2803b6e84e
commit
efe98067da
6 changed files with 47 additions and 1 deletions
|
@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
|
|||
|
||||
v 8.4.0 (unreleased)
|
||||
- Implement new UI for group page
|
||||
- Implement search inside emoji picker
|
||||
|
||||
v 8.3.0
|
||||
- Add CAS support (tduehr)
|
||||
|
|
|
@ -10,6 +10,8 @@ class @AwardsHandler
|
|||
if $(".emoji-menu").is(":visible")
|
||||
$(".emoji-menu").hide()
|
||||
|
||||
@setupSearch()
|
||||
|
||||
addAward: (emoji) ->
|
||||
emoji = @normilizeEmojiName(emoji)
|
||||
@postEmoji emoji, =>
|
||||
|
@ -108,3 +110,23 @@ class @AwardsHandler
|
|||
|
||||
normilizeEmojiName: (emoji) ->
|
||||
@aliases[emoji] || emoji
|
||||
|
||||
setupSearch: ->
|
||||
$("input.emoji-search").keyup (ev)=>
|
||||
term = $(ev.target).val()
|
||||
|
||||
# Clean previous search results
|
||||
$("ul.emoji-search,h5.emoji-search").remove()
|
||||
|
||||
if term
|
||||
# Generate search result block
|
||||
h5 = $("<h5>").text("Search results").addClass("emoji-search")
|
||||
found_emojis = @searchEmojis(term).show()
|
||||
ul = $("<ul>").addClass("emoji-search").append(found_emojis)
|
||||
$(".emoji-menu-content ul, .emoji-menu-content h5").hide()
|
||||
$(".emoji-menu-content").append(h5).append(ul)
|
||||
else
|
||||
$(".emoji-menu-content").children().show()
|
||||
|
||||
searchEmojis: (term)->
|
||||
$(".emoji-menu-content [data-emoji*='" + term + "']").closest("li").clone()
|
||||
|
|
|
@ -101,6 +101,10 @@
|
|||
overflow: auto;
|
||||
}
|
||||
|
||||
input.emoji-search{
|
||||
background: url(/assets/icon-search.png) 240px no-repeat;
|
||||
}
|
||||
|
||||
li {
|
||||
cursor: pointer;
|
||||
width: 30px;
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
= icon('smile-o')
|
||||
.emoji-menu
|
||||
.emoji-menu-content
|
||||
= text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
|
||||
- AwardEmoji.emoji_by_category.each do |category, emojis|
|
||||
%h5= AwardEmoji::CATEGORIES[category]
|
||||
%ul
|
||||
|
@ -32,7 +33,7 @@
|
|||
aliases
|
||||
)
|
||||
|
||||
$(".emoji-menu-content li").click (e)->
|
||||
$(".awards").on "click", ".emoji-menu-content li", (e)->
|
||||
emoji = $(this).find(".emoji-icon").data("emoji")
|
||||
awards_handler.addAward(emoji)
|
||||
|
||||
|
|
|
@ -18,6 +18,12 @@ Feature: Award Emoji
|
|||
Given I click to emoji-picker
|
||||
Then I can see the activity and food categories
|
||||
|
||||
@javascript
|
||||
Scenario: I can search emoji
|
||||
Given I click to emoji-picker
|
||||
And I search "hand"
|
||||
Then I see search result for "hand"
|
||||
|
||||
@javascript
|
||||
Scenario: I add award emoji using regular comment
|
||||
Given I leave comment with a single emoji
|
||||
|
|
|
@ -52,4 +52,16 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
|
|||
click_button 'Add Comment'
|
||||
end
|
||||
end
|
||||
|
||||
step 'I search "hand"' do
|
||||
page.within('.emoji-menu-content') do
|
||||
fill_in 'emoji_search', with: 'hand'
|
||||
end
|
||||
end
|
||||
|
||||
step 'I see search result for "hand"' do
|
||||
page.within '.emoji-menu-content' do
|
||||
expect(page).to have_selector '[data-emoji="raised_hand"]'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue