diff options
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/versions | 1 | ||||
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | client/components/main/editor.jade | 5 | ||||
| -rwxr-xr-x | client/components/main/editor.js | 19 |
5 files changed, 8 insertions, 24 deletions
diff --git a/.meteor/packages b/.meteor/packages index 7c04f207..792efb79 100644 --- a/.meteor/packages +++ b/.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 diff --git a/.meteor/versions b/.meteor/versions index 416093aa..14a80591 100644 --- a/.meteor/versions +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index fc4c12fc..dbd7e981 100644 --- a/CHANGELOG.md +++ b/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: diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index f10d64a1..31f533e6 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -9,6 +9,5 @@ template(name="editor") template(name="viewer") .viewer +mentions - +emoji - +markdown - {{> UI.contentBlock }} + +markdown + {{> UI.contentBlock }} diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 5987b772..ea24f518 100755 --- a/client/components/main/editor.js +++ b/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.]*)$/, |