diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-09-25 19:40:41 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-09-25 19:40:41 +0300 |
| commit | a62c8eb5a02b838e0eed809032cba31f64a122c0 (patch) | |
| tree | ef18ea8164bf5bec859fbd6d794c0d6e0cc06530 | |
| parent | f0b7f349289a6bf573563b6408cc9f66da18a292 (diff) | |
| download | wekan-a62c8eb5a02b838e0eed809032cba31f64a122c0.tar.gz wekan-a62c8eb5a02b838e0eed809032cba31f64a122c0.tar.bz2 wekan-a62c8eb5a02b838e0eed809032cba31f64a122c0.zip | |
Add emojis back, because removing them broke local dev Sandstorm.
Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/versions | 1 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | client/components/main/editor.jade | 5 | ||||
| -rwxr-xr-x | client/components/main/editor.js | 19 |
5 files changed, 32 insertions, 2 deletions
diff --git a/.meteor/packages b/.meteor/packages index 792efb79..7c04f207 100644 --- a/.meteor/packages +++ b/.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 diff --git a/.meteor/versions b/.meteor/versions index 14a80591..416093aa 100644 --- a/.meteor/versions +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 402e886d..5a22e813 100644 --- a/CHANGELOG.md +++ b/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: 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.]*)$/, |