FIX: missing emoji autocomplete

discourse · Jun 5, 2015 · a09d893 · a09d893 · SamSaffron · Jun 5, 2015
1 parent feeb509
commit a09d893
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
@@ -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 = [];