summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-25 19:27:36 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-25 19:27:36 +0000
commit103b1444bdf38057c25e4f4236ab8829a47ea120 (patch)
treee886a8a9541cbd3f8143b9ff4f37c0aa5849f4fe
parentd809507e0558465a83792ad60634379b34a3a25a (diff)
parent593f0014536c9ed8f21b00c75e8cf48b4f3ab294 (diff)
downloadgitlab-ce-103b1444bdf38057c25e4f4236ab8829a47ea120.tar.gz
Merge branch 'blur-award-btn' into 'master'
Triggers blur after clicking award button ![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif) Fixes #15511 See merge request !3881
-rw-r--r--app/assets/javascripts/awards_handler.coffee2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index af4462ece38..dcdf27d7bc0 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -31,6 +31,8 @@ class @AwardsHandler
awards_handler.addAward emoji
+ $(this).trigger 'blur'
+
didUserClickEmoji: (that, emoji) ->
if $(that).siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title")
$(that).siblings("button:has([data-emoji=#{emoji}])").attr("data-original-title").indexOf('me') > -1