From f961378600b661a35adaae181bb6b2c12d0ae3cf Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 12 Apr 2017 17:24:43 -0400 Subject: PLT-6099 Added keys to contents of PostBodyAdditionalContent (#6059) --- .../components/post_body_additional_content.jsx | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'webapp/components/post_view') diff --git a/webapp/components/post_view/components/post_body_additional_content.jsx b/webapp/components/post_view/components/post_body_additional_content.jsx index 58b6f8498..549bb9faa 100644 --- a/webapp/components/post_view/components/post_body_additional_content.jsx +++ b/webapp/components/post_view/components/post_body_additional_content.jsx @@ -153,30 +153,36 @@ export default class PostBodyAdditionalContent extends React.Component { render() { if (this.isLinkToggleable() && !this.state.linkLoadError) { - const messageWithToggle = []; - // if message has only one line and starts with a link place toggle in this only line // else - place it in new line between message and embed const prependToggle = (/^\s*https?:\/\/.*$/).test(this.props.post.message); - messageWithToggle.push( + + const toggle = ( ); + const message = ( +
+ {this.props.message} +
+ ); + let contents; if (prependToggle) { - messageWithToggle.push(this.props.message); + contents = [toggle, message]; } else { - messageWithToggle.unshift(this.props.message); + contents = [message, toggle]; } - let toggleableEmbed; if (this.state.embedVisible) { - toggleableEmbed = ( + contents.push(
{this.generateToggleableEmbed()} @@ -186,8 +192,7 @@ export default class PostBodyAdditionalContent extends React.Component { return (
- {messageWithToggle} - {toggleableEmbed} + {contents}
); } -- cgit v1.2.3-1-g7c22