diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-18 00:19:34 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-17 23:14:21 -0500 |
| commit | 72a8c2b33693712de08e5a310435f2b0e61b22b1 (patch) | |
| tree | c4b137d7da0d8346b2633e094535c127e2047a50 /app | |
| parent | cd3f27b9e1d9ba7f0a3946ab82f42146a4e3c204 (diff) | |
| download | gitlab-ce-72a8c2b33693712de08e5a310435f2b0e61b22b1.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')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 2 |
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() |