Commit 797387c6 authored by Valery Sizov's avatar Valery Sizov

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
parents 854f57e7 004b8554
...@@ -134,6 +134,7 @@ class @AwardsHandler ...@@ -134,6 +134,7 @@ class @AwardsHandler
_.compact(_.uniq(frequently_used_emojis)) _.compact(_.uniq(frequently_used_emojis))
renderFrequentlyUsedBlock: -> renderFrequentlyUsedBlock: ->
if $.cookie('frequently_used_emojis')
frequently_used_emojis = @getFrequentlyUsedEmojis() frequently_used_emojis = @getFrequentlyUsedEmojis()
ul = $("<ul>") ul = $("<ul>")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment