From 7bb378b33d1f02cbb9b09f0987d1d01cd6316671 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <a.dunstone89@gmail.com>
Date: Mon, 22 Feb 2016 20:16:00 -0600
Subject: [PATCH] Create EmojisController

---
 app/assets/javascripts/awards_handler.coffee                 | 2 +-
 app/controllers/autocomplete_controller.rb                   | 4 ----
 app/controllers/emojis_controller.rb                         | 5 +++++
 .../{shared/emoji_menu.html.haml => emojis/index.html.haml}  | 0
 config/routes.rb                                             | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 app/controllers/emojis_controller.rb
 rename app/views/{shared/emoji_menu.html.haml => emojis/index.html.haml} (100%)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 8e0e64b894..8f89d3e61a 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -19,7 +19,7 @@ class @AwardsHandler
       $(".emoji-menu").show()
       $("#emoji_search").focus()
     else
-      $.get "/emoji_menu", (response) ->
+      $.get "/emojis", (response) ->
         $(".add-award").after response
         $(".emoji-menu").show()
         $("#emoji_search").focus()
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index f1f61f0dad..77c8dafc01 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -24,10 +24,6 @@ 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/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb
new file mode 100644
index 0000000000..693e2cc482
--- /dev/null
+++ b/app/controllers/emojis_controller.rb
@@ -0,0 +1,5 @@
+class EmojisController < ApplicationController
+  def index
+    render :index, layout: false
+  end
+end
diff --git a/app/views/shared/emoji_menu.html.haml b/app/views/emojis/index.html.haml
similarity index 100%
rename from app/views/shared/emoji_menu.html.haml
rename to app/views/emojis/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
index 78d39338bf..e50f2bc5de 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,8 +42,9 @@ Rails.application.routes.draw do
   # Autocomplete
   get '/autocomplete/users' => 'autocomplete#users'
   get '/autocomplete/users/:id' => 'autocomplete#user'
-  get '/emoji_menu' => 'autocomplete#emoji_menu'
 
+  # Emojis
+  resources :emojis, only: :index
 
   # Search
   get 'search' => 'search#show'