From 03fcf990396b44ab285e409d3291789b8e82fdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 5 Jun 2015 20:24:49 +0200
Subject: [PATCH] FIX: missing emoji autocomplete

---
 app/assets/javascripts/discourse/lib/emoji/emoji.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
index 9f82adde00f..582af89dfe2 100644
--- 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 = [];