From a3b92ed02c62a121571b77a4cf7f8d5aaa8f010d Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 14 May 2016 23:24:06 +0900 Subject: [PATCH] Remove special case handling for certain emojis This does not seem to be necessary anymore after the recent update of the emoji map. --- extensions/emoji/js/forum/dist/extension.js | 2 +- extensions/emoji/js/forum/src/addComposerAutocomplete.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/emoji/js/forum/dist/extension.js b/extensions/emoji/js/forum/dist/extension.js index 668b58785..894344974 100644 --- a/extensions/emoji/js/forum/dist/extension.js +++ b/extensions/emoji/js/forum/dist/extension.js @@ -195,7 +195,7 @@ System.register('flarum/emoji/addComposerAutocomplete', ['flarum/extend', 'flaru var makeSuggestion = function makeSuggestion(key) { var code = ':' + key + ':'; - var imageName = (emojiMap[key].indexOf('-20e3') != -1 || emojiMap[key] == 'a9' || emojiMap[key] == 'ae' ? '00' : '') + emojiMap[key]; + var imageName = emojiMap[key]; return m( 'button', { diff --git a/extensions/emoji/js/forum/src/addComposerAutocomplete.js b/extensions/emoji/js/forum/src/addComposerAutocomplete.js index 6f5645fc5..fbebd5427 100644 --- a/extensions/emoji/js/forum/src/addComposerAutocomplete.js +++ b/extensions/emoji/js/forum/src/addComposerAutocomplete.js @@ -68,7 +68,7 @@ export default function addComposerAutocomplete() { const makeSuggestion = function(key) { const code = ':' + key + ':'; - const imageName = (emojiMap[key].indexOf('-20e3') != -1 || emojiMap[key] == 'a9' || emojiMap[key] == 'ae' ? '00' : '') + emojiMap[key]; + const imageName = emojiMap[key]; return (