From: ThibG <thib@sitedethib.com>
Date: Wed, 12 Jun 2019 22:16:46 +0000 (+0200)
Subject: Do not expand toot when clicking on a poll option (#11067)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a4a502e85cc824c74635c8b7664c6339ec0afc93;p=mastodon.git

Do not expand toot when clicking on a poll option (#11067)

Fixes regression introduced by e9ddd5a159c821e3fb75ff997f40a4bca35c326c
---

diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 01b4351be..06f5b4aad 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -107,8 +107,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 === '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 === 'a' || element.localName === 'label') {
+        return;
+      }
+      element = element.parentNode;
     }
 
     if (deltaX + deltaY < 5 && e.button === 0 && this.props.onClick) {