From 1642fbec31972313de6d54b64babde25ab7caea8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 6 Nov 2018 08:02:19 +0900
Subject: [PATCH] =?UTF-8?q?[Client]=20=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=B5=E3=82=B8=E3=82=A7=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E7=B5=90=E6=9E=9C=E3=82=92=E3=82=A2=E3=83=AB?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=83=99=E3=83=83=E3=83=88=E9=A0=86=E3=81=AB?=
 =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/components/autocomplete.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index 661d340863..064a362bff 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -216,7 +216,11 @@ export default Vue.extend({
 				}
 			} else if (this.type == 'emoji') {
 				if (this.q == null || this.q == '') {
-					this.emojis = this.emojiDb.filter(x => x.isCustomEmoji && !x.aliasOf);
+					this.emojis = this.emojiDb.filter(x => x.isCustomEmoji && !x.aliasOf).sort((a, b) => {
+						var textA = a.name.toUpperCase();
+						var textB = b.name.toUpperCase();
+						return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
+					});
 					return;
 				}