From c05029d40312bdc57d99be1d792a1d592c17d029 Mon Sep 17 00:00:00 2001
From: Daniel <DanielF847@gmail.com>
Date: Sun, 28 Feb 2016 23:10:52 -0600
Subject: Changes in code to correct the spelling of emoji (plural)

---
 client/components/main/editor.js | 4 ++--
 client/lib/keyboard.js           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 client/components/main/editor.js
 mode change 100644 => 100755 client/lib/keyboard.js

(limited to 'client')

diff --git a/client/components/main/editor.js b/client/components/main/editor.js
old mode 100644
new mode 100755
index a30a5e1d..709d22e2
--- 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
diff --git a/client/lib/keyboard.js b/client/lib/keyboard.js
old mode 100644
new mode 100755
index f8212c9b..ff18738b
--- a/client/lib/keyboard.js
+++ b/client/lib/keyboard.js
@@ -88,7 +88,7 @@ Template.keyboardShortcuts.helpers({
     action: 'shortcut-autocomplete-members',
   }, {
     keys: [':'],
-    action: 'shortcut-autocomplete-emojies',
+    action: 'shortcut-autocomplete-emoji',
   }, {
     keys: ['SPACE'],
     action: 'shortcut-assign-self',
-- 
cgit v1.2.3-1-g7c22