Fix up visual indicators for compose form privacy
This commit is contained in:
parent
b8f9de8636
commit
1fd88e3bad
2 changed files with 5 additions and 7 deletions
|
@ -30,8 +30,7 @@ const ComposeForm = React.createClass({
|
|||
suggestion_token: React.PropTypes.string,
|
||||
suggestions: ImmutablePropTypes.list,
|
||||
spoiler: React.PropTypes.bool,
|
||||
private: React.PropTypes.bool,
|
||||
unlisted: React.PropTypes.bool,
|
||||
privacy: React.PropTypes.string,
|
||||
spoiler_text: React.PropTypes.string,
|
||||
focusDate: React.PropTypes.instanceOf(Date),
|
||||
preselectDate: React.PropTypes.instanceOf(Date),
|
||||
|
@ -137,10 +136,10 @@ const ComposeForm = React.createClass({
|
|||
);
|
||||
}
|
||||
|
||||
if (this.props.private) {
|
||||
if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
|
||||
publishText = <span><i className='fa fa-lock' /> {intl.formatMessage(messages.publish)}</span>;
|
||||
} else {
|
||||
publishText = intl.formatMessage(messages.publish) + (!this.props.unlisted ? '!' : '');
|
||||
publishText = intl.formatMessage(messages.publish) + (this.props.privacy !== 'unlisted' ? '!' : '');
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
|
@ -28,14 +28,13 @@ const mapStateToProps = (state, props) => {
|
|||
suggestions: state.getIn(['compose', 'suggestions']),
|
||||
spoiler: state.getIn(['compose', 'spoiler']),
|
||||
spoiler_text: state.getIn(['compose', 'spoiler_text']),
|
||||
unlisted: state.getIn(['compose', 'unlisted'], ),
|
||||
private: state.getIn(['compose', 'private']),
|
||||
privacy: state.getIn(['compose', 'privacy']),
|
||||
focusDate: state.getIn(['compose', 'focusDate']),
|
||||
preselectDate: state.getIn(['compose', 'preselectDate']),
|
||||
is_submitting: state.getIn(['compose', 'is_submitting']),
|
||||
is_uploading: state.getIn(['compose', 'is_uploading']),
|
||||
me: state.getIn(['compose', 'me']),
|
||||
needsPrivacyWarning: state.getIn(['compose', 'private']) && mentionedUsernames !== null,
|
||||
needsPrivacyWarning: (state.getIn(['compose', 'privacy']) === 'private' || state.getIn(['compose', 'privacy']) === 'direct') && mentionedUsernames !== null,
|
||||
mentionedDomains: mentionedUsernamesWithDomains
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue