Merge branch 'fix-award-emoji-menu' into 'master'

Fix award emoji picker for relative_url MR !2888 caused a regression where the emoji picker does not load when using relative_url, because the path for the controller was hardcoded. See merge request !3493

Merge branch 'fix-award-emoji-menu' into 'master'
2fb0ef51 · Jacob Schatz · d5169a60 · bb2214bd · 2fb0ef51 · 2fb0ef51
Commit 2fb0ef51 authored Apr 04, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

awards_handler.coffee app/assets/javascripts/awards_handler.coffee +2 -2

_votes_block.html.haml app/views/votes/_votes_block.html.haml +2 -0

No files found.
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
 class @AwardsHandler
-  constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
+  constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
    $(".js-add-award").on "click", (event) =>
      event.stopPropagation()
      event.preventDefault()
@@ -34,7 +34,7 @@ class @AwardsHandler
        $("#emoji_search").focus()
    else
      $('.js-add-award').addClass "is-loading"
-      $.get "/emojis", (response) =>
+      $.get @get_emojis_url, (response) =>
        $('.js-add-award').removeClass "is-loading"
        $(".js-award-holder").append response
        setTimeout =>

--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -15,12 +15,14 @@

 - if current_user
  :javascript
+    var get_emojis_url = "#{emojis_path}";
    var post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}";
    var noteable_type = "#{votable.class.name.underscore}";
    var noteable_id = "#{votable.id}";
    var aliases = #{AwardEmoji.aliases.to_json};

    window.awards_handler = new AwardsHandler(
+      get_emojis_url,
      post_emoji_url,
      noteable_type,
      noteable_id,