commit: 6a1b738e0b48cd55ad76df3073edf237a5b0e43f
parent: 0924eee81baf8f864449b616532589a9213bca57
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 1 Mar 2017 13:57:44 +0100
Merge branch 'marrus-sh-mastodon-paste-support'
Diffstat:
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/components/components/autosuggest_textarea.jsx b/app/assets/javascripts/components/components/autosuggest_textarea.jsx
@@ -40,7 +40,8 @@ const AutosuggestTextarea = React.createClass({
onSuggestionsFetchRequested: React.PropTypes.func.isRequired,
onChange: React.PropTypes.func.isRequired,
onKeyUp: React.PropTypes.func,
- onKeyDown: React.PropTypes.func
+ onKeyDown: React.PropTypes.func,
+ onPaste: React.PropTypes.func.isRequired,
},
getInitialState () {
@@ -173,6 +174,13 @@ const AutosuggestTextarea = React.createClass({
})
},
+ onPaste (e) {
+ if (e.clipboardData && e.clipboardData.files.length === 1) {
+ this.props.onPaste(e.clipboardData.files)
+ e.preventDefault();
+ }
+ },
+
render () {
const { value, suggestions, fileDropDate, disabled, placeholder, onKeyUp } = this.props;
const { isFileDragging, suggestionsHidden, selectedSuggestion } = this.state;
@@ -198,6 +206,7 @@ const AutosuggestTextarea = React.createClass({
onBlur={this.onBlur}
onDragEnter={this.onDragEnter}
onDragExit={this.onDragExit}
+ onPaste={this.onPaste}
style={style}
/>
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -47,6 +47,7 @@ const ComposeForm = React.createClass({
onFetchSuggestions: React.PropTypes.func.isRequired,
onSuggestionSelected: React.PropTypes.func.isRequired,
onChangeSpoilerText: React.PropTypes.func.isRequired,
+ onPaste: React.PropTypes.func.isRequired,
},
mixins: [PureRenderMixin],
@@ -100,7 +101,7 @@ const ComposeForm = React.createClass({
},
render () {
- const { intl, needsPrivacyWarning, mentionedDomains } = this.props;
+ const { intl, needsPrivacyWarning, mentionedDomains, onPaste } = this.props;
const disabled = this.props.is_submitting || this.props.is_uploading;
let publishText = '';
@@ -149,6 +150,7 @@ const ComposeForm = React.createClass({
onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
onSuggestionsClearRequested={this.onSuggestionsClearRequested}
onSuggestionSelected={this.onSuggestionSelected}
+ onPaste={onPaste}
/>
<div style={{ marginTop: '10px', overflow: 'hidden' }}>
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
@@ -1,5 +1,6 @@
import { connect } from 'react-redux';
import ComposeForm from '../components/compose_form';
+import { uploadCompose } from '../../../actions/compose';
import { createSelector } from 'reselect';
import {
changeCompose,
@@ -65,6 +66,10 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(changeComposeSpoilerText(checked));
},
+ onPaste (files) {
+ dispatch(uploadCompose(files));
+ },
+
});
export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);