|
|
@ -98,7 +98,7 @@ export default class StatusContent extends React.PureComponent { |
|
|
|
const [ startX, startY ] = this.startXY; |
|
|
|
const [ startX, startY ] = this.startXY; |
|
|
|
const [ deltaX, deltaY ] = [Math.abs(e.clientX - startX), Math.abs(e.clientY - startY)]; |
|
|
|
const [ deltaX, deltaY ] = [Math.abs(e.clientX - startX), Math.abs(e.clientY - startY)]; |
|
|
|
|
|
|
|
|
|
|
|
if (e.target.localName === 'button' || e.target.localName === 'a' || (e.target.parentNode && (e.target.parentNode.localName === 'button' || e.target.parentNode.localName === 'a'))) { |
|
|
|
if (e.target.localName === 'button' || e.target.localName == 'video' || e.target.localName === 'a' || (e.target.parentNode && (e.target.parentNode.localName === 'button' || e.target.parentNode.localName === 'a'))) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -188,11 +188,9 @@ export default class StatusContent extends React.PureComponent { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
return ( |
|
|
|
<div className={classNames} tabIndex='0'> |
|
|
|
<div className={classNames} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}> |
|
|
|
<p |
|
|
|
<p |
|
|
|
style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }} |
|
|
|
style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }} |
|
|
|
onMouseDown={this.handleMouseDown} |
|
|
|
|
|
|
|
onMouseUp={this.handleMouseUp} |
|
|
|
|
|
|
|
> |
|
|
|
> |
|
|
|
<span dangerouslySetInnerHTML={spoilerContent} /> |
|
|
|
<span dangerouslySetInnerHTML={spoilerContent} /> |
|
|
|
{' '} |
|
|
|
{' '} |
|
|
@ -208,8 +206,6 @@ export default class StatusContent extends React.PureComponent { |
|
|
|
ref={this.setRef} |
|
|
|
ref={this.setRef} |
|
|
|
style={directionStyle} |
|
|
|
style={directionStyle} |
|
|
|
tabIndex={!hidden ? 0 : null} |
|
|
|
tabIndex={!hidden ? 0 : null} |
|
|
|
onMouseDown={this.handleMouseDown} |
|
|
|
|
|
|
|
onMouseUp={this.handleMouseUp} |
|
|
|
|
|
|
|
dangerouslySetInnerHTML={content} |
|
|
|
dangerouslySetInnerHTML={content} |
|
|
|
/> |
|
|
|
/> |
|
|
|
{media} |
|
|
|
{media} |
|
|
@ -222,12 +218,12 @@ export default class StatusContent extends React.PureComponent { |
|
|
|
<div |
|
|
|
<div |
|
|
|
className={classNames} |
|
|
|
className={classNames} |
|
|
|
style={directionStyle} |
|
|
|
style={directionStyle} |
|
|
|
|
|
|
|
onMouseDown={this.handleMouseDown} |
|
|
|
|
|
|
|
onMouseUp={this.handleMouseUp} |
|
|
|
tabIndex='0' |
|
|
|
tabIndex='0' |
|
|
|
> |
|
|
|
> |
|
|
|
<div |
|
|
|
<div |
|
|
|
ref={this.setRef} |
|
|
|
ref={this.setRef} |
|
|
|
onMouseDown={this.handleMouseDown} |
|
|
|
|
|
|
|
onMouseUp={this.handleMouseUp} |
|
|
|
|
|
|
|
dangerouslySetInnerHTML={content} |
|
|
|
dangerouslySetInnerHTML={content} |
|
|
|
tabIndex='0' |
|
|
|
tabIndex='0' |
|
|
|
/> |
|
|
|
/> |
|
|
|