Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-05-23 21:33:58 +0300
committerFatih Acet <acetfatih@gmail.com>2016-05-23 21:33:58 +0300
commit85e9eece7ecac4eaecd12c85de76ddf9c5acc241 (patch)
treebf755174e3fd349d29b1963e8286f870b4d32376 /app/assets/javascripts/notes.js.coffee
parente8c8c9d7b275a9037d181e71ef77e29a5f649cf7 (diff)
Fix displaying emoji only comments.
To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly.
Diffstat (limited to 'app/assets/javascripts/notes.js.coffee')
-rw-r--r--app/assets/javascripts/notes.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 6d9d6528f45..687dc285519 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -167,8 +167,8 @@ class @Notes
return
if note.award
- awardsHandler.addAwardToEmojiBar(note.note)
- awardsHandler.scrollToAwards()
+ awards_handler.addAwardToEmojiBar(note.name)
+ awards_handler.scrollToAwards()
# render note if it not present in loaded list
# or skip if rendered