mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move PollForm from features/composer to features/compose

pull/574/head
Thibaut Girka 2019-04-20 23:27:20 +02:00 committed by ThibG
parent f1a22e33e2
commit c5f49a92dc
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/compose/components/compose_form.js
View File

@ -9,7 +9,7 @@ import ComposerOptions from '../../composer/options';
import ComposerPublisher from '../../composer/publisher'; import ComposerPublisher from '../../composer/publisher';
import ComposerTextarea from '../../composer/textarea'; import ComposerTextarea from '../../composer/textarea';
import ComposerUploadForm from '../../composer/upload_form'; import ComposerUploadForm from '../../composer/upload_form';
import ComposerPollForm from '../../composer/poll_form'; import PollFormContainer from '../containers/poll_form_container';
import WarningContainer from '../containers/warning_container'; import WarningContainer from '../containers/warning_container';
import ReplyIndicatorContainer from '../containers/reply_indicator_container'; import ReplyIndicatorContainer from '../containers/reply_indicator_container';
@ -382,9 +382,7 @@ class ComposeForm extends ImmutablePureComponent {
handleRef={handleRefUploadForm} handleRef={handleRefUploadForm}
/> />
) : null} ) : null}
{!!poll && ( <PollFormContainer />
<ComposerPollForm />
)}
</div> </div>
<ComposerOptions <ComposerOptions
acceptContentTypes={acceptContentTypes} acceptContentTypes={acceptContentTypes}

0
app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js → app/javascript/flavours/glitch/features/compose/components/poll_form.js
View File

4
app/javascript/flavours/glitch/features/composer/poll_form/index.js → app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
View File

@ -1,6 +1,6 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PollForm from './components/poll_form'; import PollForm from '../components/poll_form';
import { addPollOption, removePollOption, changePollOption, changePollSettings } from '../../../actions/compose'; import { addPollOption, removePollOption, changePollOption, changePollSettings } from 'flavours/glitch/actions/compose';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
options: state.getIn(['compose', 'poll', 'options']), options: state.getIn(['compose', 'poll', 'options']),