Add emojis back, because removing them broke local dev Sandstorm.

Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323
This commit is contained in:
Lauri Ojansivu 2017-09-25 19:40:41 +03:00
parent f0b7f34928
commit a62c8eb5a0
5 changed files with 32 additions and 2 deletions

View file

@ -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

View file

@ -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

View file

@ -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:

View file

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

View file

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