]> cat aescling's git repositories - mastodon.git/commitdiff
More debugging
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Oct 2016 22:59:18 +0000 (00:59 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Oct 2016 22:59:18 +0000 (00:59 +0200)
app/assets/javascripts/components/components/status.jsx
app/assets/javascripts/components/reducers/timelines.jsx
config/environments/production.rb

index d3acff3f0c064f88b4d88205abb547a505e1f5bc..5437591136430ec3844a21b8556ea1168946c1b0 100644 (file)
@@ -45,6 +45,8 @@ const Status = React.createClass({
 
     var { status, ...other } = this.props;
 
+    console.log(status, this.props);
+
     if (status.get('reblog') !== null) {
       let displayName = status.getIn(['account', 'display_name']);
 
index 2059079eb9f8c01fb77e119adaefa6408f4c0793..ba4ac921d2f72c28a59aba52ba36912955261da3 100644 (file)
@@ -129,7 +129,7 @@ function updateTimeline(state, timeline, status) {
 
     if (reblogOfId !== null) {
       const otherReblogs = state.get('statuses').filter(item => item.get('reblog') === reblogOfId).map((_, itemId) => itemId);
-      list = list.filterNot(itemId => itemId === reblogOfId || otherReblogs.includes(itemId));
+      list = list.filterNot(itemId => (itemId === reblogOfId || otherReblogs.includes(itemId)));
     }
 
     return list.unshift(status.get('id'));
index 34381e4ca31046dc0a114ae0983adf37a4c3f3d8..1a2b660a7720bb9a6cf5cc8a60bc1cc74c575f9e 100644 (file)
@@ -19,7 +19,7 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  # config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(mangle: false, output: { comments: :all })
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.