Move award_menu_url variable into gon object.
This commit is contained in:
parent
52525dc4c2
commit
92af60c244
|
@ -282,7 +282,7 @@ class @AwardsHandler
|
||||||
@createEmojiMenu @getAwardMenuUrl(), => @createEmoji_ votesBlock, emoji
|
@createEmojiMenu @getAwardMenuUrl(), => @createEmoji_ votesBlock, emoji
|
||||||
|
|
||||||
|
|
||||||
getAwardMenuUrl: -> return gl.awardMenuUrl
|
getAwardMenuUrl: -> return gon.award_menu_url
|
||||||
|
|
||||||
|
|
||||||
resolveNameToCssClass: (emoji) ->
|
resolveNameToCssClass: (emoji) ->
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
= awards.count
|
= awards.count
|
||||||
|
|
||||||
- if current_user
|
- if current_user
|
||||||
:javascript
|
|
||||||
gl.awardMenuUrl = "#{emojis_path}"
|
|
||||||
|
|
||||||
.award-menu-holder.js-award-holder
|
.award-menu-holder.js-award-holder
|
||||||
%button.btn.award-control.js-add-award{ type: "button" }
|
%button.btn.award-control.js-add-award{ type: "button" }
|
||||||
= icon('smile-o', class: "award-control-icon award-control-icon-normal")
|
= icon('smile-o', class: "award-control-icon award-control-icon-normal")
|
||||||
|
|
|
@ -8,6 +8,7 @@ module Gitlab
|
||||||
gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
|
gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
|
||||||
gon.shortcuts_path = help_shortcuts_path
|
gon.shortcuts_path = help_shortcuts_path
|
||||||
gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class
|
gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class
|
||||||
|
gon.award_menu_url = emojis_path
|
||||||
|
|
||||||
if current_user
|
if current_user
|
||||||
gon.current_user_id = current_user.id
|
gon.current_user_id = current_user.id
|
||||||
|
|
|
@ -3,10 +3,11 @@
|
||||||
#= require jquery.cookie
|
#= require jquery.cookie
|
||||||
#= require ./fixtures/emoji_menu
|
#= require ./fixtures/emoji_menu
|
||||||
|
|
||||||
awardsHandler = null
|
awardsHandler = null
|
||||||
window.gl or= {}
|
window.gl or= {}
|
||||||
gl.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
|
window.gon or= {}
|
||||||
gl.awardMenuUrl = '/emojis'
|
gl.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' }
|
||||||
|
gon.award_menu_url = '/emojis'
|
||||||
|
|
||||||
|
|
||||||
lazyAssert = (done, assertFn) ->
|
lazyAssert = (done, assertFn) ->
|
||||||
|
@ -25,9 +26,7 @@ describe 'AwardsHandler', ->
|
||||||
fixture.load 'awards_handler.html'
|
fixture.load 'awards_handler.html'
|
||||||
awardsHandler = new AwardsHandler
|
awardsHandler = new AwardsHandler
|
||||||
spyOn(awardsHandler, 'postEmoji').and.callFake (url, emoji, cb) => cb()
|
spyOn(awardsHandler, 'postEmoji').and.callFake (url, emoji, cb) => cb()
|
||||||
spyOn(jQuery, 'get').and.callFake (req, cb) ->
|
spyOn(jQuery, 'get').and.callFake (req, cb) -> cb window.emojiMenu
|
||||||
expect(req).toBe '/emojis'
|
|
||||||
cb window.emojiMenu
|
|
||||||
|
|
||||||
|
|
||||||
describe '::showEmojiMenu', ->
|
describe '::showEmojiMenu', ->
|
||||||
|
|
Loading…
Reference in New Issue