diff options
| author | Annabel Dunstone <a.dunstone89@gmail.com> | 2016-02-18 22:02:22 -0600 |
|---|---|---|
| committer | Annabel Dunstone <a.dunstone89@gmail.com> | 2016-02-18 22:02:22 -0600 |
| commit | 074fa8f2b94bbd3039da96819b5f0e615274a101 (patch) | |
| tree | a7790b5c9c02a5fb0250b614cd94716b314a83bf | |
| parent | 66c03e0e2948159793bf0f288a5253a7ad56869a (diff) | |
| download | gitlab-ce-074fa8f2b94bbd3039da96819b5f0e615274a101.tar.gz | |
Load award emoji picker with ajax request
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 13 | ||||
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/emoji_menu.html.haml | 9 | ||||
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 9 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
5 files changed, 25 insertions, 11 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 360acb864f6..a0009141c27 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -1,9 +1,10 @@ class @AwardsHandler constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) -> - $(".add-award").click (event)-> + $(".add-award").click (event) => event.stopPropagation() event.preventDefault() - $(".emoji-menu").show() + + @showEmojiMenu() $("#emoji_search").focus() $("html").on 'click', (event) -> @@ -14,6 +15,14 @@ class @AwardsHandler @renderFrequentlyUsedBlock() @setupSearch() + showEmojiMenu: -> + if $(".emoji-menu").length + $(".emoji-menu").show() + else + $.get "/emoji_menu", (response) -> + $(".add-award").after response + $(".emoji-menu").show() + addAward: (emoji) -> emoji = @normilizeEmojiName(emoji) @postEmoji emoji, => diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 77c8dafc012..f1f61f0dad9 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -24,6 +24,10 @@ class AutocompleteController < ApplicationController render json: @user, only: [:name, :username, :id], methods: [:avatar_url] end + def emoji_menu + render 'shared/emoji_menu', layout: false + end + private def find_users diff --git a/app/views/shared/emoji_menu.html.haml b/app/views/shared/emoji_menu.html.haml new file mode 100644 index 00000000000..b66e513e4d2 --- /dev/null +++ b/app/views/shared/emoji_menu.html.haml @@ -0,0 +1,9 @@ +.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 + - emojis.each do |emoji| + %li + = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"])
\ No newline at end of file diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index 91c5b7eac5e..176fd29cb57 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -9,15 +9,6 @@ .awards-controls %a.add-award{"href" => "#"} = 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 - - emojis.each do |emoji| - %li - = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"]) - if current_user :javascript diff --git a/config/routes.rb b/config/routes.rb index 507bcbc53d7..78d39338bf2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,6 +42,7 @@ Rails.application.routes.draw do # Autocomplete get '/autocomplete/users' => 'autocomplete#users' get '/autocomplete/users/:id' => 'autocomplete#user' + get '/emoji_menu' => 'autocomplete#emoji_menu' # Search |