gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Merge branch 'mastodon-paste-support' of https://github.com/marrus-sh/ardipithecus into marrus-sh-mastodon-paste-support

Browse source
This commit is contained in:
Eugen Rochko 2017-03-01 13:54:52 +01:00
commit 1fa2e7cc86
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/components/components/autosuggest_textarea.jsx
View file

@ -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}
/>