Enable emojis in reply indicator as well
This commit is contained in:
		
							parent
							
								
									82fd74d101
								
							
						
					
					
						commit
						1c17b932fe
					
				@ -38,8 +38,6 @@ const Status = React.createClass({
 | 
				
			|||||||
      e.preventDefault();
 | 
					      e.preventDefault();
 | 
				
			||||||
      this.context.router.push(`/accounts/${id}`);
 | 
					      this.context.router.push(`/accounts/${id}`);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    e.stopPropagation();
 | 
					 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
 | 
				
			|||||||
@ -3,9 +3,18 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
				
			|||||||
import Avatar from '../../../components/avatar';
 | 
					import Avatar from '../../../components/avatar';
 | 
				
			||||||
import IconButton from '../../../components/icon_button';
 | 
					import IconButton from '../../../components/icon_button';
 | 
				
			||||||
import DisplayName from '../../../components/display_name';
 | 
					import DisplayName from '../../../components/display_name';
 | 
				
			||||||
 | 
					import emojione from 'emojione';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					emojione.imageType = 'png';
 | 
				
			||||||
 | 
					emojione.sprites = false;
 | 
				
			||||||
 | 
					emojione.imagePathPNG = '/emoji/';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const ReplyIndicator = React.createClass({
 | 
					const ReplyIndicator = React.createClass({
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  contextTypes: {
 | 
				
			||||||
 | 
					    router: React.PropTypes.object
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  propTypes: {
 | 
					  propTypes: {
 | 
				
			||||||
    status: ImmutablePropTypes.map.isRequired,
 | 
					    status: ImmutablePropTypes.map.isRequired,
 | 
				
			||||||
    onCancel: React.PropTypes.func.isRequired
 | 
					    onCancel: React.PropTypes.func.isRequired
 | 
				
			||||||
@ -17,15 +26,22 @@ const ReplyIndicator = React.createClass({
 | 
				
			|||||||
    this.props.onCancel();
 | 
					    this.props.onCancel();
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleAccountClick (e) {
 | 
				
			||||||
 | 
					    if (e.button === 0) {
 | 
				
			||||||
 | 
					      e.preventDefault();
 | 
				
			||||||
 | 
					      this.context.router.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    let content = { __html: this.props.status.get('content') };
 | 
					    let content = { __html: emojione.unicodeToImage(this.props.status.get('content')) };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
      <div style={{ background: '#9baec8', padding: '10px' }}>
 | 
					      <div style={{ background: '#9baec8', padding: '10px' }}>
 | 
				
			||||||
        <div style={{ overflow: 'hidden', marginBottom: '5px' }}>
 | 
					        <div style={{ overflow: 'hidden', marginBottom: '5px' }}>
 | 
				
			||||||
          <div style={{ float: 'right', lineHeight: '24px' }}><IconButton title='Cancel' icon='times' onClick={this.handleClick} /></div>
 | 
					          <div style={{ float: 'right', lineHeight: '24px' }}><IconButton title='Cancel' icon='times' onClick={this.handleClick} /></div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          <a href={this.props.status.getIn(['account', 'url'])} className='reply-indicator__display-name' style={{ display: 'block', maxWidth: '100%', paddingRight: '25px', color: '#282c37', textDecoration: 'none', overflow: 'hidden', lineHeight: '24px' }}>
 | 
					          <a href={this.props.status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='reply-indicator__display-name' style={{ display: 'block', maxWidth: '100%', paddingRight: '25px', color: '#282c37', textDecoration: 'none', overflow: 'hidden', lineHeight: '24px' }}>
 | 
				
			||||||
            <div style={{ float: 'left', marginRight: '5px' }}><Avatar size={24} src={this.props.status.getIn(['account', 'avatar'])} /></div>
 | 
					            <div style={{ float: 'left', marginRight: '5px' }}><Avatar size={24} src={this.props.status.getIn(['account', 'avatar'])} /></div>
 | 
				
			||||||
            <DisplayName account={this.props.status.get('account')} />
 | 
					            <DisplayName account={this.props.status.get('account')} />
 | 
				
			||||||
          </a>
 | 
					          </a>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user