about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/components/poll.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-06 03:57:46 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-06 11:42:25 +0100
commit7f32d675b05b012a80c2b34c07d361ec8d596bf3 (patch)
tree8f8af21594e8a8762347002fd9ddb13b5e95aa8a /app/javascript/flavours/glitch/components/poll.js
parent48062329973398fe5b12cadcc389c8602f1bb17f (diff)
Render unicode emoji in polls using emoji pack
Port 4407f07014096bcbaf5a06015a5791984282846d to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/components/poll.js')
-rw-r--r--app/javascript/flavours/glitch/components/poll.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/poll.js b/app/javascript/flavours/glitch/components/poll.js
index 182491af8..c52445c86 100644
--- a/app/javascript/flavours/glitch/components/poll.js
+++ b/app/javascript/flavours/glitch/components/poll.js
@@ -120,7 +120,7 @@ class Poll extends ImmutablePureComponent {
           {!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />}
           {showResults && <span className='poll__number'>{Math.round(percent)}%</span>}
 
-          {option.get('title')}
+          <span dangerouslySetInnerHTML={{ __html: option.get('title_emojified') }} />
         </label>
       </li>
     );