diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-11-06 09:05:32 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-06 09:05:32 -0500 |
| commit | 1ecad4301e6e511a426da5884a54111c5bb7a4fd (patch) | |
| tree | 114dea884f0a08729f5b6b5f9e45d2e470bedc71 /web/react/components/post_body.jsx | |
| parent | 6417d4728dc9351d5bf3180e458be8ce6e1e642f (diff) | |
| parent | 195728b949a4f3aee75e01f4b0e4a0b2f67850da (diff) | |
| download | chat-1ecad4301e6e511a426da5884a54111c5bb7a4fd.tar.gz chat-1ecad4301e6e511a426da5884a54111c5bb7a4fd.tar.bz2 chat-1ecad4301e6e511a426da5884a54111c5bb7a4fd.zip | |
Merge pull request #1327 from florianorben/PLT-857-2
PLT-857: Support `attachments` for Incoming Webhooks
Diffstat (limited to 'web/react/components/post_body.jsx')
| -rw-r--r-- | web/react/components/post_body.jsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index e4094daf3..5a157b792 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -7,6 +7,7 @@ const Utils = require('../utils/utils.jsx'); const Constants = require('../utils/constants.jsx'); const TextFormatting = require('../utils/text_formatting.jsx'); const twemoji = require('twemoji'); +const PostBodyAdditionalContent = require('./post_body_additional_content.jsx'); export default class PostBody extends React.Component { constructor(props) { @@ -331,6 +332,9 @@ export default class PostBody extends React.Component { dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.state.message)}} /> </div> + <PostBodyAdditionalContent + post={post} + /> {fileAttachmentHolder} {embed} </div> |