diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-15 08:20:01 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-15 08:20:01 -0400 |
commit | 4a9984d166ff939129740f69e1bd382769a954bb (patch) | |
tree | 1e035ed97b937066f27c72899c240689efe58e66 /web/react/components/message_wrapper.jsx | |
parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
parent | 4c9ae22b6207c477b92737f4e79901c7366a4792 (diff) | |
download | chat-4a9984d166ff939129740f69e1bd382769a954bb.tar.gz chat-4a9984d166ff939129740f69e1bd382769a954bb.tar.bz2 chat-4a9984d166ff939129740f69e1bd382769a954bb.zip |
Merge pull request #676 from hmhealey/mm1900b
MM-1900 Removed textToJsx
Diffstat (limited to 'web/react/components/message_wrapper.jsx')
-rw-r--r-- | web/react/components/message_wrapper.jsx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/web/react/components/message_wrapper.jsx b/web/react/components/message_wrapper.jsx index bce305853..5adf4f228 100644 --- a/web/react/components/message_wrapper.jsx +++ b/web/react/components/message_wrapper.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); +var TextFormatting = require('../utils/text_formatting.jsx'); export default class MessageWrapper extends React.Component { constructor(props) { @@ -10,10 +10,7 @@ export default class MessageWrapper extends React.Component { } render() { if (this.props.message) { - var inner = Utils.textToJsx(this.props.message, this.props.options); - return ( - <div>{inner}</div> - ); + return <div dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.message, this.props.options)}}/>; } return <div/>; @@ -21,8 +18,7 @@ export default class MessageWrapper extends React.Component { } MessageWrapper.defaultProps = { - message: null, - options: null + message: '' }; MessageWrapper.propTypes = { message: React.PropTypes.string, |