From d7c6c6dbe109544911f3fca5c547b55d1e79ccc2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 24 Mar 2017 03:50:30 +0100 Subject: Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295) --- .../features/compose/containers/compose_form_container.jsx | 1 - .../features/compose/containers/upload_progress_container.jsx | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/components/features/compose/containers/upload_progress_container.jsx (limited to 'app/assets/javascripts/components/features/compose/containers') 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 a67adbdd6..835b37516 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 @@ -30,7 +30,6 @@ const mapStateToProps = (state, props) => { spoiler_text: state.getIn(['compose', 'spoiler_text']), unlisted: state.getIn(['compose', 'unlisted'], ), private: state.getIn(['compose', 'private']), - fileDropDate: state.getIn(['compose', 'fileDropDate']), focusDate: state.getIn(['compose', 'focusDate']), preselectDate: state.getIn(['compose', 'preselectDate']), is_submitting: state.getIn(['compose', 'is_submitting']), diff --git a/app/assets/javascripts/components/features/compose/containers/upload_progress_container.jsx b/app/assets/javascripts/components/features/compose/containers/upload_progress_container.jsx new file mode 100644 index 000000000..b0f1d4d19 --- /dev/null +++ b/app/assets/javascripts/components/features/compose/containers/upload_progress_container.jsx @@ -0,0 +1,9 @@ +import { connect } from 'react-redux'; +import UploadProgress from '../components/upload_progress'; + +const mapStateToProps = (state, props) => ({ + active: state.getIn(['compose', 'is_uploading']), + progress: state.getIn(['compose', 'progress']) +}); + +export default connect(mapStateToProps)(UploadProgress); -- cgit