diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-04 19:47:15 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-04 19:47:15 +0000 |
| commit | 2fb0ef51d68aab083b95348770e0c15dd7e1c3ec (patch) | |
| tree | 2b8a477e6c1e662b44c4f45412c691e8c82f74b5 | |
| parent | d5169a60d44f278614ba7970b737461ffbb8a1ea (diff) | |
| parent | bb2214bd64b621e3d0813696535ce4c960612ca1 (diff) | |
| download | gitlab-ce-2fb0ef51d68aab083b95348770e0c15dd7e1c3ec.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 4 | ||||
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 47b080406d4..6a670d5e887 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -1,5 +1,5 @@ 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 => diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index 02647229776..8ffcdc4a327 100644 --- 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, |