diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index e535bd525b8..b4a341675bd 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -232,7 +232,7 @@ class @AwardsHandler return @createEmoji_ emoji if $('.emoji-menu').length - awardMenuUrl = $('[data-award-menu-url]').data 'award-menu-url' + awardMenuUrl = gl.awardMenuUrl or '/emojis' @createEmojiMenu awardMenuUrl, => @createEmoji emoji diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index 86931c70f33..19d1275a926 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -7,6 +7,9 @@ = awards.count - if current_user + :javascript + gl.awardMenuUrl = "#{emojis_path}" + .award-menu-holder.js-award-holder %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } } = icon('smile-o', {class: "award-control-icon award-control-icon-normal"}) diff --git a/app/views/emoji_awards/_awards_block.html.haml b/app/views/emoji_awards/_awards_block.html.haml index 1b840d88752..e9b286b7c3f 100644 --- a/app/views/emoji_awards/_awards_block.html.haml +++ b/app/views/emoji_awards/_awards_block.html.haml @@ -7,6 +7,9 @@ = awards.count - if current_user + :javascript + gl.awardMenuUrl = emojis_path + .award-menu-holder.js-award-holder %button.btn.award-control.js-add-award{ type: "button", data: { award_menu_url: emojis_path } } = icon('smile-o', {class: "award-control-icon award-control-icon-normal"})