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

FIX: custom emoji autocomplete

This commit is contained in:
Régis Hanol 2015-06-02 17:48:19 +02:00
parent 8449896f3d
commit 9d4c53c882
1 changed files with 1 additions and 1 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

@ -166,7 +166,7 @@ Discourse.Emoji.search = function(term, options) {
var maxResults = (options && options["maxResults"]) || -1;
if (maxResults === 0) { return []; }
toSearch = toSearch || _.keys(emojiHash);
toSearch = toSearch || _.merge(_.keys(emojiHash), _.keys(extendedEmoji));
var i, results = [];