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

Fix emoji block selector. Fixes #18465 and #18577 See merge request !4604

Merge branch 'award-emoji-fix' into 'master'
433e0a41 · Jacob Schatz · 102f4d8d · bcc3f8f2 · 433e0a41
Commit 433e0a41 authored Jun 15, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -40,7 +40,7 @@ class @AwardsHandler
    $menu = $ '.emoji-menu'

    if $addBtn.hasClass 'js-note-emoji'
-      $addBtn.parents('.note').find('.js-awards-block').addClass 'current'
+      $addBtn.closest('.note').find('.js-awards-block').addClass 'current'
    else
      $addBtn.closest('.js-awards-block').addClass 'current'