github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-15 16:16:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: missing emoji autocomplete

Browse Source
This commit is contained in:
Régis Hanol 2015-06-05 20:24:49 +02:00 committed by Robin Ward
parent 28d219dfed
commit 03fcf99039
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 || _.merge(_.keys(emojiHash), _.keys(extendedEmoji));
toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji)).sort();
var i, results = [];