diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-04-25 20:10:20 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-10 12:03:13 +0200 |
| commit | dccf8a9fc8d4dde91942944f6b47387bfb13c380 (patch) | |
| tree | 7574eea0adcc0cd46bf3d685fccec0d08c37b252 /app/assets/javascripts | |
| parent | 4eb16290e4e95c0a9bcf3d01ecc8060d91eec021 (diff) | |
| download | gitlab-ce-dccf8a9fc8d4dde91942944f6b47387bfb13c380.tar.gz | |
Add tests on Awardables and Award Emoji
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 20 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 4c0a274b793..589caf011ed 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -4,21 +4,21 @@ class @AwardsHandler $(document) .off "click", ".js-add-award" - .on "click", ".js-add-award", (event) => - event.stopPropagation() - event.preventDefault() + .on "click", ".js-add-award", (e) => + e.stopPropagation() + e.preventDefault() - @showEmojiMenu $(event.currentTarget) + @showEmojiMenu $(e.currentTarget) - $("html").on 'click', (event) -> - if !$(event.target).closest(".emoji-menu").length + $("html").on 'click', (e) -> + if !$(e.target).closest(".emoji-menu").length if $(".emoji-menu").is(":visible") $('.js-add-award.is-active').removeClass 'is-active' $(".emoji-menu").removeClass "is-visible" $(document) .off "click", ".js-emoji-btn" - .on "click", ".js-emoji-btn", (e) => @handleClick(e) + .on "click", ".js-emoji-btn", @handleClick.bind(@) handleClick: (e) -> e.preventDefault() @@ -31,7 +31,8 @@ class @AwardsHandler else if $votesBlock.length is 0 $votesBlock = $addAwardBtn.closest('.js-awards-block') - $votesBlock.addClass 'js-awards-block-current' + @currentVoteBlock = $votesBlock + awardUrl = $votesBlock.data 'award-url' emoji = $emojiBtn .find(".icon") @@ -103,7 +104,6 @@ class @AwardsHandler emoji = @normilizeEmojiName(emoji) @postEmoji awardUrl, emoji, => @addAwardToEmojiBar(emoji) - $('.js-awards-block').removeClass 'js-awards-block-current' $(".emoji-menu").removeClass "is-visible" @@ -210,7 +210,7 @@ class @AwardsHandler callback.call() findEmojiIcon: (emoji) -> - $(".js-awards-block-current.awards > .js-emoji-btn [data-emoji='#{emoji}']") + @currentVoteBlock.find(".js-emoji-btn [data-emoji='#{emoji}']") scrollToAwards: -> $('body, html').animate({ diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index ae8c1f22e4c..74ae897b84a 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -150,7 +150,7 @@ class @Notes renderNote: (note) -> unless note.valid if note.award - flash = new Flash('You have already awarded this emoji, and it we\'ve removed it', 'alert') + flash = new Flash('You have already awarded this emoji, it has been removed', 'alert') flash.pinTo('.header-content') return |