summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorDaniel <DanielF847@gmail.com>2016-02-28 23:10:52 -0600
committerDaniel <DanielF847@gmail.com>2016-02-28 23:10:52 -0600
commitc05029d40312bdc57d99be1d792a1d592c17d029 (patch)
treea0d22d131adb8e7c881db7f4e8ac859166b09880 /client/components
parentdc05b01ee1d36e7c7be4dff76c4a204ad86a237a (diff)
downloadwekan-c05029d40312bdc57d99be1d792a1d592c17d029.tar.gz
wekan-c05029d40312bdc57d99be1d792a1d592c17d029.tar.bz2
wekan-c05029d40312bdc57d99be1d792a1d592c17d029.zip
Changes in code to correct the spelling of emoji (plural)
Diffstat (limited to 'client/components')
-rwxr-xr-x[-rw-r--r--]client/components/main/editor.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index a30a5e1d..709d22e2 100644..100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -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