about summary refs log tree commit diff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/components/components/status.jsx4
-rw-r--r--app/assets/javascripts/components/selectors/index.jsx2
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx
index 6e4c9651d..8855c6c12 100644
--- a/app/assets/javascripts/components/components/status.jsx
+++ b/app/assets/javascripts/components/components/status.jsx
@@ -44,9 +44,7 @@ const Status = React.createClass({
     let media = '';
     let { status, ...other } = this.props;
 
-    if (status.get('reblog', null) !== null) {
-      console.log(status.get('id'), status.get('reblog'));
-
+    if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
       let displayName = status.getIn(['account', 'display_name']);
 
       if (displayName.length === 0) {
diff --git a/app/assets/javascripts/components/selectors/index.jsx b/app/assets/javascripts/components/selectors/index.jsx
index 6980b9ec3..91f900f90 100644
--- a/app/assets/javascripts/components/selectors/index.jsx
+++ b/app/assets/javascripts/components/selectors/index.jsx
@@ -45,8 +45,6 @@ const assembleStatus = (id, statuses, accounts) => {
     }
   }
 
-  console.log('assembly for status', id, Immutable.Map.isMap(reblog) ? reblog.toJS() : reblog);
-
   return status.set('reblog', reblog).set('account', accounts.get(status.get('account')));
 };