From 581e3e836ad6c8a9a211eb09d7eaa1fbaf830da2 Mon Sep 17 00:00:00 2001 From: eal Date: Mon, 20 Nov 2017 20:32:51 +0200 Subject: Add completion for normal emoji. --- src/main.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/main.js') diff --git a/src/main.js b/src/main.js index b6544a5a..14cb27eb 100644 --- a/src/main.js +++ b/src/main.js @@ -125,5 +125,14 @@ window.fetch('/api/pleroma/emoji.json') const emoji = Object.keys(values).map((key) => { return { shortcode: key, image_url: values[key] } }) + store.dispatch('setOption', { name: 'customEmoji', value: emoji }) + }) + +window.fetch('/static/emoji.json') + .then((res) => res.json()) + .then((values) => { + const emoji = Object.keys(values).map((key) => { + return { shortcode: key, image_url: false, 'utf': values[key] } + }) store.dispatch('setOption', { name: 'emoji', value: emoji }) }) -- cgit v1.2.3-70-g09d2 From 90175a1872cace45ae0e410ed283fab25c9e42cd Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 1 Feb 2018 18:12:23 +0200 Subject: Fix name clash on unicode and custom emoji --- src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.js') diff --git a/src/main.js b/src/main.js index 51e0f7eb..305077b1 100644 --- a/src/main.js +++ b/src/main.js @@ -136,7 +136,7 @@ window.fetch('/api/pleroma/emoji.json') const emoji = Object.keys(values).map((key) => { return { shortcode: key, image_url: values[key] } }) - store.dispatch('setOption', { name: 'emoji', value: emoji }) + store.dispatch('setOption', { name: 'customEmoji', value: emoji }) }, (failure) => {} ), -- cgit v1.2.3-70-g09d2