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

Merge branch 'fix_frequently_emojis' into 'master'
797387c6 · Valery Sizov · 854f57e7 · 004b8554 · 797387c6
Commit 797387c6 authored Dec 28, 2015 by Valery Sizov
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

awards_handler.coffee app/assets/javascripts/awards_handler.coffee +1 -0

No files found.
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -134,6 +134,7 @@ class @AwardsHandler
    _.compact(_.uniq(frequently_used_emojis))

  renderFrequentlyUsedBlock: ->
+    if $.cookie('frequently_used_emojis')
      frequently_used_emojis = @getFrequentlyUsedEmojis()

      ul = $("<ul>")