diff options
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/awards.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/emojis.scss | 2 | ||||
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 4 | ||||
| -rw-r--r-- | features/project/issues/award_emoji.feature | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index fc49a1e7bf4..392440a2b00 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -118,7 +118,7 @@ class @AwardsHandler @aliases[emoji] || emoji setupSearch: -> - $("input.emoji-search").keyup (ev)=> + $("input.emoji-search").keyup (ev) => term = $(ev.target).val() # Clean previous search results @@ -135,4 +135,4 @@ class @AwardsHandler $(".emoji-menu-content").children().show() searchEmojis: (term)-> - $(".emoji-menu-content [data-emoji*='" + term + "']").closest("li").clone() + $(".emoji-menu-content [data-emoji*='#{term}']").closest("li").clone() diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss index 842d73acaa6..19d0d361c79 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/pages/awards.scss @@ -102,7 +102,7 @@ } input.emoji-search{ - background: url(/assets/icon-search.png) 240px no-repeat; + background: image-url(/assets/icon-search.png) 240px no-repeat; } li { diff --git a/app/assets/stylesheets/pages/emojis.scss b/app/assets/stylesheets/pages/emojis.scss index 819ec9a2f5f..920d0e3d338 100644 --- a/app/assets/stylesheets/pages/emojis.scss +++ b/app/assets/stylesheets/pages/emojis.scss @@ -4,7 +4,7 @@ The source: gemojione gem. */ .emoji-icon{ - background-image: url(emoji.png); + background-image: image-url(emoji.png); background-repeat: no-repeat; } diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index a344ac1a62e..e16187bb42f 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -33,11 +33,11 @@ aliases ) - $(".awards").on "click", ".emoji-menu-content li", (e)-> + $(".awards").on "click", ".emoji-menu-content li", (e) -> emoji = $(this).find(".emoji-icon").data("emoji") awards_handler.addAward(emoji) - $(".awards").on "click", ".award", (e)-> + $(".awards").on "click", ".award", (e) -> emoji = $(this).find(".icon").data("emoji") awards_handler.addAward(emoji) diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature index a996ae603fc..2126e826ddc 100644 --- a/features/project/issues/award_emoji.feature +++ b/features/project/issues/award_emoji.feature @@ -18,7 +18,7 @@ Feature: Award Emoji Given I click to emoji-picker Then I can see the activity and food categories - @javascript + @javascript Scenario: I can search emoji Given I click to emoji-picker And I search "hand" |