From 2154bd1b5a56f792cf06da84221086fa3e3f38d1 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 7 May 2018 17:10:14 +0200
Subject: Widen clickable area of toots
---
app/javascript/flavours/glitch/components/status_content.js | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
(limited to 'app')
diff --git a/app/javascript/flavours/glitch/components/status_content.js b/app/javascript/flavours/glitch/components/status_content.js
index 32b0770cb..742d3accf 100644
--- a/app/javascript/flavours/glitch/components/status_content.js
+++ b/app/javascript/flavours/glitch/components/status_content.js
@@ -188,11 +188,9 @@ export default class StatusContent extends React.PureComponent {
}
return (
- <div className={classNames} tabIndex='0'>
+ <div className={classNames} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
<p
style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}
- onMouseDown={this.handleMouseDown}
- onMouseUp={this.handleMouseUp}
>
<span dangerouslySetInnerHTML={spoilerContent} />
{' '}
@@ -208,8 +206,6 @@ export default class StatusContent extends React.PureComponent {
ref={this.setRef}
style={directionStyle}
tabIndex={!hidden ? 0 : null}
- onMouseDown={this.handleMouseDown}
- onMouseUp={this.handleMouseUp}
dangerouslySetInnerHTML={content}
/>
{media}
@@ -222,12 +218,12 @@ export default class StatusContent extends React.PureComponent {
<div
className={classNames}
style={directionStyle}
+ onMouseDown={this.handleMouseDown}
+ onMouseUp={this.handleMouseUp}
tabIndex='0'
>
<div
ref={this.setRef}
- onMouseDown={this.handleMouseDown}
- onMouseUp={this.handleMouseUp}
dangerouslySetInnerHTML={content}
tabIndex='0'
/>
--
cgit
From 9d6788b30b4fdcdc1310b8384bcc763e3c7a5427 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 18 May 2018 17:49:51 +0200
Subject: Prevent click on video from opening detailed toot
---
app/javascript/flavours/glitch/components/status_content.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'app')
diff --git a/app/javascript/flavours/glitch/components/status_content.js b/app/javascript/flavours/glitch/components/status_content.js
index 742d3accf..6542df65b 100644
--- a/app/javascript/flavours/glitch/components/status_content.js
+++ b/app/javascript/flavours/glitch/components/status_content.js
@@ -98,7 +98,7 @@ export default class StatusContent extends React.PureComponent {
const [ startX, startY ] = this.startXY;
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;
}
--
cgit