Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: duplicate emojis in emoji-toolbar

This commit is contained in:
Régis Hanol 2015-03-23 21:35:53 +01:00
parent 55f293d062
commit 6930c8919e
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
View File

@ -14,7 +14,6 @@ Discourse.Dialect.registerEmoji = function(code, url) {
Discourse.Emoji.list = function(){ Discourse.Emoji.list = function(){
var list = emoji.slice(0); var list = emoji.slice(0);
_.each(aliases, function(v,k){ list.push(k); });
_.each(extendedEmoji, function(v,k){ list.push(k); }); _.each(extendedEmoji, function(v,k){ list.push(k); });
return list; return list;
}; };
@ -72,7 +71,6 @@ Discourse.Emoji.urlFor = urlFor = function(code) {
} }
if(!url && emojiHash.hasOwnProperty(code)) { if(!url && emojiHash.hasOwnProperty(code)) {
if (aliases.hasOwnProperty(code)) { code = aliases[code]; }
url = Discourse.getURL('/images/emoji/' + set + '/' + code + '.png'); url = Discourse.getURL('/images/emoji/' + set + '/' + code + '.png');
} }