diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /web/react/utils/emoticons.jsx | |
parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip |
Fixing merge conflict
Diffstat (limited to 'web/react/utils/emoticons.jsx')
-rw-r--r-- | web/react/utils/emoticons.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx index 7b43e48b4..aabddcffd 100644 --- a/web/react/utils/emoticons.jsx +++ b/web/react/utils/emoticons.jsx @@ -133,7 +133,7 @@ export function handleEmoticons(text, tokens) { const alias = `MM_EMOTICON${index}`; tokens.set(alias, { - value: `<img align="absmiddle" alt=${match} class="emoji" src=${getImagePathForEmoticon(name)} title=${match} />`, + value: `<img align="absmiddle" alt="${match}" class="emoji" src="${getImagePathForEmoticon(name)}" title="${match}" />`, originalText: match }); |