logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 6611e3a2efbae27585f0153211b6f5cc80ba9fc7
parent: 4baca34a4596b6224e108053d0e42b98324afe92
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 18 Oct 2016 00:59:18 +0200

More debugging

Diffstat:

Mapp/assets/javascripts/components/components/status.jsx2++
Mapp/assets/javascripts/components/reducers/timelines.jsx2+-
Mconfig/environments/production.rb2+-
3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx @@ -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']); diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx @@ -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')); diff --git a/config/environments/production.rb b/config/environments/production.rb @@ -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.