From a62c8eb5a02b838e0eed809032cba31f64a122c0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 19:40:41 +0300 Subject: Add emojis back, because removing them broke local dev Sandstorm. Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323 --- client/components/main/editor.jade | 5 +++-- client/components/main/editor.js | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'client/components') diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index 31f533e6..f10d64a1 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -9,5 +9,6 @@ template(name="editor") template(name="viewer") .viewer +mentions - +markdown - {{> UI.contentBlock }} + +emoji + +markdown + {{> UI.contentBlock }} diff --git a/client/components/main/editor.js b/client/components/main/editor.js index ea24f518..5987b772 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -4,6 +4,25 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete([ + // Emoji + { + match: /\B:([\-+\w]*)$/, + search(term, callback) { + callback(Emoji.values.map((emoji) => { + return emoji.includes(term) ? emoji : null; + }).filter(Boolean)); + }, + template(value) { + const imgSrc = Emoji.baseImagePath + value; + const image = ``; + return image + value; + }, + replace(value) { + return `:${value}:`; + }, + index: 1, + }, + // User mentions { match: /\B@([\w.]*)$/, -- cgit v1.2.3-1-g7c22