FIX: duplicate emojis in emoji-toolbar

discourse · Mar 23, 2015 · 6930c89 · 6930c89
1 parent 55f293d
commit 6930c89
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
@@ -14,7 +14,6 @@ Discourse.Dialect.registerEmoji = function(code, url) {
 
 Discourse.Emoji.list = function(){
   var list = emoji.slice(0);
-  _.each(aliases, function(v,k){ list.push(k); });
   _.each(extendedEmoji, function(v,k){ list.push(k); });
   return list;
 };
@@ -72,7 +71,6 @@ Discourse.Emoji.urlFor = urlFor = function(code) {
   }
 
   if(!url && emojiHash.hasOwnProperty(code)) {
-    if (aliases.hasOwnProperty(code)) { code = aliases[code]; }
     url = Discourse.getURL('/images/emoji/' + set + '/' + code + '.png');
   }