summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/awards_handler.js
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2016-08-05 16:42:25 -0500
committerClement Ho <ClemMakesApps@gmail.com>2016-09-06 09:39:43 -0500
commit0986fe23bc8f55de07a5220add33275c3c73952e (patch)
tree919d1d07df774ef4bd5549a61c88812a57c68cc4 /app/assets/javascripts/awards_handler.js
parent83cd3d79ea306dbcb1ed6f74b9591cb580b94fc6 (diff)
downloadgitlab-ce-0986fe23bc8f55de07a5220add33275c3c73952e.tar.gz
Replace animateEmoji timeout with eventListener
Diffstat (limited to 'app/assets/javascripts/awards_handler.js')
-rw-r--r--app/assets/javascripts/awards_handler.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index ad12cb906e1..5ea18ea8b7a 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -255,12 +255,12 @@
};
AwardsHandler.prototype.animateEmoji = function($emoji) {
- var className;
- className = 'pulse animated';
+ var className = 'pulse animated once short';
$emoji.addClass(className);
- return setTimeout((function() {
- return $emoji.removeClass(className);
- }), 321);
+
+ $emoji.on('webkitAnimationEnd animationEnd', function() {
+ $(this).removeClass(className);
+ });
};
AwardsHandler.prototype.createEmoji = function(votesBlock, emoji) {