Merge pull request #751 from hmhealey/plt344

PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting

web/react/components/post_body.jsx

@@ -35,7 +35,6 @@ export default class PostBody extends React.Component {
 
     parseEmojis() {
         twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE});
-        global.window.emojify.run(React.findDOMNode(this.refs.message_span));
     }
 
     componentDidMount() {

web/react/components/rhs_comment.jsx

@@ -56,7 +56,6 @@ export default class RhsComment extends React.Component {
     }
     parseEmojis() {
         twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE});
-        global.window.emojify.run(React.findDOMNode(this.refs.message_holder));
     }
     componentDidMount() {
         this.parseEmojis();

web/react/components/rhs_root_post.jsx

@@ -20,7 +20,6 @@ export default class RhsRootPost extends React.Component {
     }
     parseEmojis() {
         twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE});
-        global.window.emojify.run(React.findDOMNode(this.refs.message_holder));
     }
     componentDidMount() {
         this.parseEmojis();