treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix toots opening in dynamic column when trying to interact with them 

This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
lolsob-rspec
Thibaut Girka 2019-03-05 23:17:09 +01:00 committed by ThibG
parent 66206bf2f9
commit bd97259b57
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/components/status_content.js
View File

@ -100,8 +100,12 @@ 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 == 'video' || e.target.localName === 'a' || (e.target.parentNode && (e.target.parentNode.localName === 'button' || e.target.parentNode.localName === 'a'))) {
return;
let element = e.target;
while (element) {
if (element.localName === 'button' || element.localName === 'video' || element.localName === 'a' || element.localName === 'label') {
return;
}
element = element.parentNode;
}
if (deltaX + deltaY < 5 && e.button === 0 && parseClick) {