about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-08-24 19:23:37 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-08-24 19:23:37 +0200
commitbc0692d75b1eeb7bc439869d892da9b835b40e0d (patch)
tree97094799e3c9234eefba49a068757c277e5e2628 /app/assets
parentd23671b5fd910e1c59f52938789a8a3321724ef6 (diff)
Removing mini-profiler that doesn't work, formatting timelines a bit better
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/components/components/status.jsx7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx
index 9bbb02077..68c1efaad 100644
--- a/app/assets/javascripts/components/components/status.jsx
+++ b/app/assets/javascripts/components/components/status.jsx
@@ -6,11 +6,12 @@ const Status = React.createClass({
   },
 
   render: function() {
-    console.log(this.props.status.toJS());
+    var content = { __html: this.props.status.get('content') };
 
     return (
-      <div style={{ height: '100px' }}>
-        {this.props.status.getIn(['account', 'username'])}: {this.props.status.get('content')}
+      <div style={{ padding: '5px' }}>
+        <div><strong>{this.props.status.getIn(['account', 'username'])}</strong></div>
+        <div dangerouslySetInnerHTML={content} />
       </div>
     );
   }