diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-03 12:59:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 12:59:21 +0100 |
| commit | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (patch) | |
| tree | 88a1715021c33add55501351dbf74950deeac481 /app/assets/javascripts/components/features | |
| parent | 3125dd8920af1b6e9847dc7cef79de108411656a (diff) | |
| parent | 4d300e2507c1f8f5aeebc1079eeddcad1edca4a5 (diff) | |
Merge pull request #386 from mitchhentges/file-drop-ui
On file-drag, show a border around textarea
Diffstat (limited to 'app/assets/javascripts/components/features')
| -rw-r--r-- | app/assets/javascripts/components/features/compose/components/compose_form.jsx | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx index 012e39c91..55f361b0b 100644 --- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx +++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx @@ -27,6 +27,7 @@ const ComposeForm = React.createClass({ sensitive: React.PropTypes.bool, unlisted: React.PropTypes.bool, private: React.PropTypes.bool, + fileDropDate: React.PropTypes.instanceOf(Date), is_submitting: React.PropTypes.bool, is_uploading: React.PropTypes.bool, in_reply_to: ImmutablePropTypes.map, @@ -110,6 +111,7 @@ const ComposeForm = React.createClass({ ref={this.setAutosuggestTextarea} placeholder={intl.formatMessage(messages.placeholder)} disabled={disabled} + fileDropDate={this.props.fileDropDate} value={this.props.text} onChange={this.handleChange} suggestions={this.props.suggestions} diff --git a/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx b/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx index 1d8f20ca7..2b6ee1ae7 100644 --- a/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx +++ b/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx @@ -24,6 +24,7 @@ const makeMapStateToProps = () => { sensitive: state.getIn(['compose', 'sensitive']), unlisted: state.getIn(['compose', 'unlisted']), private: state.getIn(['compose', 'private']), + fileDropDate: state.getIn(['compose', 'fileDropDate']), is_submitting: state.getIn(['compose', 'is_submitting']), is_uploading: state.getIn(['compose', 'is_uploading']), in_reply_to: getStatus(state, state.getIn(['compose', 'in_reply_to'])), |