Browse Source

Remove emoji support, because it breaks MAC addresses, urls, code etc.
Thanks to xet7 ! Closes #1248, closes #743, closes #643, closes #323

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

+ 0 - 1
.meteor/packages

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

+ 0 - 1
.meteor/versions

@@ -129,7 +129,6 @@ 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

+ 6 - 0
CHANGELOG.md

@@ -1,3 +1,9 @@
+# Upcoming Wekan release
+
+* [Remove emoji support, because it breaks MAC addresses, urls, code etc](https://github.com/wekan/wekan/issues/1248).
+
+Thanks to GitHub user xet7 for contributions.
+
 # v0.41 2017-09-25 Wekan release
 
 This release fixes the following bugs:

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

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

+ 0 - 19
client/components/main/editor.js

@@ -4,25 +4,6 @@ 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.]*)$/,