summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-18 00:19:34 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-18 00:19:34 +0000
commit5433637d300f62fde4421d63929016caa1ef47a4 (patch)
tree13bf8e7a9121d86a7b15787072acfafd0521ec0a /app/assets
parent26d28ea0b440aefef6b1677d02e2c842c5f5d376 (diff)
parent604a811f80a16b7713a2a3fba0e7309d99ab2285 (diff)
downloadgitlab-ce-5433637d300f62fde4421d63929016caa1ef47a4.tar.gz
Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'master'
Fixes issue where firefox does not delete message after comment submit Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473 See merge request !2452
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/awards_handler.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 619abb1fb07..4670c95344d 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -5,7 +5,7 @@ class @AwardsHandler
event.preventDefault()
$(".emoji-menu").show()
- $("html").click ->
+ $("html").on 'click', (event) ->
if !$(event.target).closest(".emoji-menu").length
if $(".emoji-menu").is(":visible")
$(".emoji-menu").hide()