summaryrefslogtreecommitdiffstats
path: root/client/components/main/editor.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-02-12 23:52:22 +0200
committerLauri Ojansivu <x@xet7.org>2018-02-12 23:52:22 +0200
commit056843d66c361594d5d4478cfe86e2e405333b91 (patch)
tree006d1352a327644a548e7a64f318d19b74db9fb6 /client/components/main/editor.js
parent69e4ad48bf94b6d9fa4c3cff23031c1e6795e182 (diff)
downloadwekan-056843d66c361594d5d4478cfe86e2e405333b91.tar.gz
wekan-056843d66c361594d5d4478cfe86e2e405333b91.tar.bz2
wekan-056843d66c361594d5d4478cfe86e2e405333b91.zip
Remove Emoji support, so MAC addresses etc show correctly.
Thanks to xet7 ! Closes #1248, closes #323
Diffstat (limited to 'client/components/main/editor.js')
-rwxr-xr-xclient/components/main/editor.js21
1 files changed, 1 insertions, 20 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 5f384ece..888fbe00 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.]*)$/,
@@ -47,7 +28,7 @@ Template.editor.onRendered(() => {
import sanitizeXss from 'xss';
// XXX I believe we should compute a HTML rendered field on the server that
-// would handle markdown, emoji and user mentions. We can simply have two
+// would handle markdown and user mentions. We can simply have two
// fields, one source, and one compiled version (in HTML) and send only the
// compiled version to most users -- who don't need to edit.
// In the meantime, all the transformation are done on the client using the