diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
| commit | 8af1f08539d7c2863107bd3dfd36002b7558e252 (patch) | |
| tree | a50006d11cdf6b834b49c2c98dc192609ba4471a /src/components/poll/poll.js | |
| parent | 25a8b48bf28e1a0e0765f28221c5528f5854656b (diff) | |
| parent | 4d73eaa6cef7a8b81bcca719755b11c05717d395 (diff) | |
Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
Diffstat (limited to 'src/components/poll/poll.js')
| -rw-r--r-- | src/components/poll/poll.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js index 98db5582..a69b7886 100644 --- a/src/components/poll/poll.js +++ b/src/components/poll/poll.js @@ -1,10 +1,14 @@ -import Timeago from '../timeago/timeago.vue' +import Timeago from 'components/timeago/timeago.vue' +import RichContent from 'components/rich_content/rich_content.jsx' import { forEach, map } from 'lodash' export default { name: 'Poll', - props: ['basePoll'], - components: { Timeago }, + props: ['basePoll', 'emoji'], + components: { + Timeago, + RichContent + }, data () { return { loading: false, |