summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-12-02 12:06:42 -0500
committerhmhealey <harrisonmhealey@gmail.com>2015-12-03 08:49:12 -0500
commit2c514720d5a035c44dbeca930ec416ad60087304 (patch)
tree322f2b3b03a05f5314c33c22b448315beed3b6e9
parentffd5d554659816ac0fd24f1470fe7ee6dfe7ba50 (diff)
downloadchat-2c514720d5a035c44dbeca930ec416ad60087304.tar.gz
chat-2c514720d5a035c44dbeca930ec416ad60087304.tar.bz2
chat-2c514720d5a035c44dbeca930ec416ad60087304.zip
Fixed emoticon code to use an ES6 map properly
-rw-r--r--web/react/utils/emoticons.jsx8
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx
index 8943e9544..ab04936c0 100644
--- a/web/react/utils/emoticons.jsx
+++ b/web/react/utils/emoticons.jsx
@@ -116,19 +116,19 @@ function initializeEmoticonMap() {
const out = new Map();
for (let i = 0; i < emoticonNames.length; i++) {
- out[emoticonNames[i]] = true;
+ out.set(emoticonNames[i], true);
}
return out;
}
-const emoticonMap = initializeEmoticonMap();
+export const emoticonMap = initializeEmoticonMap();
export function handleEmoticons(text, tokens) {
let output = text;
function replaceEmoticonWithToken(fullMatch, prefix, matchText, name) {
- if (emoticonMap[name]) {
+ if (emoticonMap.has(name)) {
const index = tokens.size;
const alias = `MM_EMOTICON${index}`;
@@ -159,4 +159,4 @@ export function getImagePathForEmoticon(name) {
return `/static/images/emoji/${name}.png`;
}
return `/static/images/emoji`;
-} \ No newline at end of file
+}