Merge branch 'fix_frequently_emojis' into 'master'

[emoji-picker] Do not show frequently used category when it's empty

I added one condition.

See merge request !2221
This commit is contained in:
Valery Sizov 2015-12-28 09:46:21 +00:00
commit 797387c66f
1 changed files with 7 additions and 6 deletions

View File

@ -134,6 +134,7 @@ class @AwardsHandler
_.compact(_.uniq(frequently_used_emojis))
renderFrequentlyUsedBlock: ->
if $.cookie('frequently_used_emojis')
frequently_used_emojis = @getFrequentlyUsedEmojis()
ul = $("<ul>")