Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #531 from TheElf/devel

Browse source 
Plural of Emoji
This commit is contained in:
Maxime Quandalle 2016-03-18 17:14:10 +01:00
commit e1d01e1652
18 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/main/editor.js Normal file → Executable file
View file

@ -4,7 +4,7 @@ Template.editor.onRendered(() => {
autosize($textarea);
$textarea.escapeableTextComplete([
// Emojies
// Emoji
{
match: /\B:([\-+\w]*)$/,
search(term, callback) {
@ -45,7 +45,7 @@ Template.editor.onRendered(() => {
});
// XXX I believe we should compute a HTML rendered field on the server that
// would handle markdown, emojies and user mentions. We can simply have two
// would handle markdown, emoji 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