Fixed shortcuts for emoji recent

10 years ago · 6aabc78bf2
1 changed files with 7 additions and 5 deletions
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@ -53,11 +53,13 @@
          if (Array.isArray(shortcut)) {
            shortcut = shortcut[0];
          }
-          if (shortcut.charAt(0) == ':') {
+          if (shortcut && typeof shortcut !== 'string') {
-            shortcut = shortcut.substr(1, shortcut.length - 2);
+            if (shortcut.charAt(0) == ':') {
-          }
+              shortcut = shortcut.substr(1, shortcut.length - 2);
-          if (code = shortcuts[shortcut]) {
+            }
-            result.push({code: code, rate: 1});
+            if (code = shortcuts[shortcut]) {
              result.push({code: code, rate: 1});
            }
          }
        }
        callback(result);