Add emojis back, because removing them broke local dev Sandstorm.

Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323

2 files changed, 22 insertions, 2 deletions

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 = `<img src="${imgSrc}.png" />`;
+        return image + value;
+      },
+      replace(value) {
+        return `:${value}:`;
+      },
+      index: 1,
+    },
+
     // User mentions
     {
       match: /\B@([\w.]*)$/,