gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add sensitive checkbox with inputing link

Browse source
This commit is contained in:
KMY 2023-07-26 11:15:37 +09:00
parent c9a7c5723d
commit 3258d09c64
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/features/compose/components/compose_form.jsx
View file

@ -23,6 +23,7 @@ import PollFormContainer from '../containers/poll_form_container';
import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
import ReplyIndicatorContainer from '../containers/reply_indicator_container';
import SearchabilityDropdownContainer from '../containers/searchability_dropdown_container';
import SensitiveButtonContainer from '../containers/sensitive_button_container';
import SpoilerButtonContainer from '../containers/spoiler_button_container';
import UploadButtonContainer from '../containers/upload_button_container';
import UploadFormContainer from '../containers/upload_form_container';
@ -234,7 +235,7 @@ class ComposeForm extends ImmutablePureComponent {
};
render () {
const { intl, onPaste, autoFocus } = this.props;
const { intl, onPaste, autoFocus, anyMedia, text } = this.props;
const { highlighted } = this.state;
const disabled = this.props.isSubmitting;
@ -248,6 +249,8 @@ class ComposeForm extends ImmutablePureComponent {
publishText = (this.props.privacy !== 'unlisted' && this.props.privacy !== 'public_unlisted' && this.props.privacy !== 'login') ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
}
const anyLink = text.indexOf('https://') >= 0;
return (
<form className='compose-form' onSubmit={this.handleSubmit}>
<WarningContainer />
@ -297,6 +300,7 @@ class ComposeForm extends ImmutablePureComponent {
<div className='compose-form__modifiers'>
<UploadFormContainer />
<PollFormContainer />
{(anyMedia || anyLink) && <SensitiveButtonContainer />}
</div>
</AutosuggestTextarea>

3
app/javascript/mastodon/features/compose/components/upload_form.jsx
View file

@ -1,7 +1,6 @@
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import SensitiveButtonContainer from '../containers/sensitive_button_container';
import UploadContainer from '../containers/upload_container';
import UploadProgressContainer from '../containers/upload_progress_container';
@ -23,8 +22,6 @@ export default class UploadForm extends ImmutablePureComponent {
<UploadContainer id={id} key={id} />
))}
</div>
{!mediaIds.isEmpty() && <SensitiveButtonContainer />}
</div>
);
}