From 553170b77acea8867cb67deca7c24ce9e16c9c48 Mon Sep 17 00:00:00 2001
From: Stephen Burgess <stephenburgess8@gmail.com>
Date: Mon, 10 Apr 2017 14:31:26 -0500
Subject: [PATCH] Fix #1097 When onClick is falsy, do not make status content
clickable (#1434)
---
.../components/components/status_content.jsx | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index 6c25afdea5..52826ace0f 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}
+ />
+ );
}
},