logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 8a081ce588594154f93702ac2983cb7c0fca015a
parent: 714e41d472eee88780fb1194b3e53e434104d557
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue,  7 Feb 2017 00:40:35 +0100

Fix wrong prediction of whether toot will apear on public timeline in UI

Diffstat:

Mapp/assets/javascripts/components/actions/compose.jsx2+-
Mapp/assets/javascripts/components/components/button.jsx2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx @@ -84,7 +84,7 @@ export function submitCompose() { // To make the app more responsive, immediately get the status into the columns dispatch(updateTimeline('home', { ...response.data })); - if (response.data.in_reply_to_id === null && !getState().getIn(['compose', 'private']) && !getState().getIn(['compose', 'unlisted'])) { + if (response.data.in_reply_to_id === null && response.data.visibility === 'public') { dispatch(updateTimeline('public', { ...response.data })); } }).catch(function (error) { diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx @@ -3,7 +3,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; const Button = React.createClass({ propTypes: { - text: React.PropTypes.string, + text: React.PropTypes.node, onClick: React.PropTypes.func, disabled: React.PropTypes.bool, block: React.PropTypes.bool,