Browse Source

Add emojis back, because removing them broke local dev Sandstorm.
Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323

Lauri Ojansivu 7 years ago
parent
commit
a62c8eb5a0
5 changed files with 32 additions and 2 deletions
  1. 1 0
      .meteor/packages
  2. 1 0
      .meteor/versions
  3. 8 0
      CHANGELOG.md
  4. 3 2
      client/components/main/editor.jade
  5. 19 0
      client/components/main/editor.js

+ 1 - 0
.meteor/packages

@@ -69,6 +69,7 @@ mquandalle:mousetrap-bindglobal
 mquandalle:perfect-scrollbar
 peerlibrary:blaze-components@=0.15.1
 perak:markdown
+seriousm:emoji-continued
 templates:tabs
 verron:autosize
 simple:json-routes

+ 1 - 0
.meteor/versions

@@ -129,6 +129,7 @@ reactive-var@1.0.11
 reload@1.1.11
 retry@1.0.9
 routepolicy@1.0.12
+seriousm:emoji-continued@1.4.0
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9

+ 8 - 0
CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.43 2017-09-25 Wekan release
+
+This release fixes the following bugs:
+
+* [Add emojis back, because removing them broke local dev Sandstorm](https://github.com/wekan/wekan/issues/1248).
+
+Thanks to GitHub user xet7 for contributions.
+
 # v0.42 2017-09-25 Wekan release
 
 This release fixes the following bugs:

+ 3 - 2
client/components/main/editor.jade

@@ -9,5 +9,6 @@ template(name="editor")
 template(name="viewer")
   .viewer
     +mentions
-      +markdown
-        {{> UI.contentBlock }}
+      +emoji
+        +markdown
+          {{> UI.contentBlock }}

+ 19 - 0
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.]*)$/,