]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #1097 When onClick is falsy, do not make status content clickable (#1434)
authorStephen Burgess <stephenburgess8@gmail.com>
Mon, 10 Apr 2017 19:31:26 +0000 (14:31 -0500)
committerEugen <eugen@zeonfederated.com>
Mon, 10 Apr 2017 19:31:26 +0000 (21:31 +0200)
app/assets/javascripts/components/components/status_content.jsx

index 6c25afdea5302324bd1c3dff855ea659ac5607ca..52826ace0f6280dd132f8bb8d77e6cf736a01d14 100644 (file)
@@ -125,7 +125,7 @@ const StatusContent = React.createClass({
           <div style={{ display: hidden ? 'none' : 'block', ...directionStyle }} dangerouslySetInnerHTML={content} />
         </div>
       );
-    } else {
+    } else if (this.props.onClick) {
       return (
         <div
           className='status__content'
@@ -135,6 +135,14 @@ const StatusContent = React.createClass({
           dangerouslySetInnerHTML={content}
         />
       );
+    } else {
+      return (
+        <div
+          className='status__content'
+          style={{ ...directionStyle }}
+          dangerouslySetInnerHTML={content}
+        />
+      );
     }
   },