about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-13 00:16:46 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-06-13 00:16:46 +0200
commita4a502e85cc824c74635c8b7664c6339ec0afc93 (patch)
tree1c5fae303ae5a6ed90086cdd6882446725fdf4a3 /app
parent1b4dcc3f7870f60089611c3b3d525978826953c3 (diff)
Do not expand toot when clicking on a poll option (#11067)
Fixes regression introduced by e9ddd5a159c821e3fb75ff997f40a4bca35c326c
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/components/status_content.js8
1 files changed, 6 insertions, 2 deletions
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) {