about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorStephen Burgess <stephenburgess8@gmail.com>2017-04-10 14:31:26 -0500
committerEugen <eugen@zeonfederated.com>2017-04-10 21:31:26 +0200
commit553170b77acea8867cb67deca7c24ce9e16c9c48 (patch)
tree4cf5e803de39b05473cc5c76ddaba75d7d785f4a /app
parent8a6096a3de66f0d6bd0b7133b5873d35ae10edea (diff)
Fix #1097 When onClick is falsy, do not make status content clickable (#1434)
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/components/components/status_content.jsx10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index 6c25afdea..52826ace0 100644
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -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}
+        />
+      );
     }
   },