diff options
author | ThibG <thib@sitedethib.com> | 2019-03-06 12:20:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-06 12:20:17 +0100 |
commit | fefacb7b7a21fc4aa40cb18ac797ecb5c44627f6 (patch) | |
tree | 7c4dbacf4603fd834da1bf8645b894634da06d4f /app/javascript/flavours/glitch/components | |
parent | e80fabfd84c1e2d157ca1cd536f68f3c75f011c1 (diff) | |
parent | 94a0149ff3e455792050e790d397d1d4d2c2d851 (diff) |
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components')
-rw-r--r-- | app/javascript/flavours/glitch/components/poll.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/poll.js b/app/javascript/flavours/glitch/components/poll.js index 182491af8..bfff7b601 100644 --- a/app/javascript/flavours/glitch/components/poll.js +++ b/app/javascript/flavours/glitch/components/poll.js @@ -7,6 +7,8 @@ import classNames from 'classnames'; import { vote, fetchPoll } from 'mastodon/actions/polls'; import Motion from 'mastodon/features/ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; +import escapeTextContentForBrowser from 'escape-html'; +import emojify from 'mastodon/features/emoji/emoji'; const messages = defineMessages({ moments: { id: 'time_remaining.moments', defaultMessage: 'Moments remaining' }, @@ -120,7 +122,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', emojify(escapeTextContentForBrowser(option.get('title')))) }} /> </label> </li> ); |