IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[PLT-5445] Mobile view: Set focus back to message box after uploading a file (#5360)

Browse Source
This commit is contained in:
Saturnino Abril
2017-02-23 17:57:41 +09:00
committed by George Goldberg
parent 9220254f05
commit f6d22ee4f0
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webapp/components/create_comment.jsx
View File

@@ -45,7 +45,7 @@ export default class CreateComment extends React.Component {
this.handleChange = this.handleChange.bind(this);
this.handleKeyDown = this.handleKeyDown.bind(this);
this.handleBlur = this.handleBlur.bind(this);
this.handleUploadClick = this.handleUploadClick.bind(this);
this.handleFileUploadChange = this.handleFileUploadChange.bind(this);
this.handleUploadStart = this.handleUploadStart.bind(this);
this.handleFileUploadComplete = this.handleFileUploadComplete.bind(this);
this.handleUploadError = this.handleUploadError.bind(this);
@@ -314,8 +314,8 @@ export default class CreateComment extends React.Component {
}
}
handleUploadClick() {
this.focusTextbox();
handleFileUploadChange() {
this.focusTextbox(true);
}
handleUploadStart(clientIds) {
@@ -400,9 +400,9 @@ export default class CreateComment extends React.Component {
draft.uploadsInProgress = uploadsInProgress;
PostStore.storeCommentDraft(this.props.rootId, draft);
const enableAddButton = this.handleEnableAddButton(this.state.message, fileInfos);
this.setState({fileInfos, uploadsInProgress});
this.setState({fileInfos, uploadsInProgress, enableAddButton});
this.handleFileUploadChange();
}
componentWillReceiveProps(newProps) {
@@ -524,7 +524,7 @@ export default class CreateComment extends React.Component {
<FileUpload
ref='fileUpload'
getFileCount={this.getFileCount}
onClick={this.handleUploadClick}
onFileUploadChange={this.handleFileUploadChange}
onUploadStart={this.handleUploadStart}
onFileUpload={this.handleFileUploadComplete}
onUploadError={this.handleUploadError}

10
webapp/components/create_post.jsx
View File

@@ -46,7 +46,7 @@ export default class CreatePost extends React.Component {
this.handleSubmit = this.handleSubmit.bind(this);
this.postMsgKeyPress = this.postMsgKeyPress.bind(this);
this.handleChange = this.handleChange.bind(this);
this.handleUploadClick = this.handleUploadClick.bind(this);
this.handleFileUploadChange = this.handleFileUploadChange.bind(this);
this.handleUploadStart = this.handleUploadStart.bind(this);
this.handleFileUploadComplete = this.handleFileUploadComplete.bind(this);
this.handleUploadError = this.handleUploadError.bind(this);
@@ -244,8 +244,8 @@ export default class CreatePost extends React.Component {
PostStore.storeCurrentDraft(draft);
}
handleUploadClick() {
this.focusTextbox();
handleFileUploadChange() {
this.focusTextbox(true);
}
handleUploadStart(clientIds, channelId) {
@@ -337,6 +337,8 @@ export default class CreatePost extends React.Component {
const enableSendButton = this.handleEnableSendButton(this.state.message, fileInfos);
this.setState({fileInfos, uploadsInProgress, enableSendButton});
this.handleFileUploadChange();
}
componentWillMount() {
@@ -577,7 +579,7 @@ export default class CreatePost extends React.Component {
<FileUpload
ref='fileUpload'
getFileCount={this.getFileCount}
onClick={this.handleUploadClick}
onFileUploadChange={this.handleFileUploadChange}
onUploadStart={this.handleUploadStart}
onFileUpload={this.handleFileUploadComplete}
onUploadError={this.handleUploadError}

7
webapp/components/file_upload.jsx
View File

@@ -126,6 +126,8 @@ class FileUpload extends React.Component {
Utils.clearFileInput(e.target);
}
this.props.onFileUploadChange();
}
handleDrop(e) {
@@ -190,6 +192,8 @@ class FileUpload extends React.Component {
self.handleDrop(e);
}
});
this.props.onFileUploadChange();
}
componentWillUnmount() {
@@ -289,6 +293,8 @@ class FileUpload extends React.Component {
this.props.onUploadStart([clientId], channelId);
}
}
this.props.onFileUploadChange();
}
keyUpload(e) {
@@ -369,6 +375,7 @@ FileUpload.propTypes = {
onClick: React.PropTypes.func,
onFileUpload: React.PropTypes.func,
onUploadStart: React.PropTypes.func,
onFileUploadChange: React.PropTypes.func,
onTextDrop: React.PropTypes.func,
channelId: React.PropTypes.string,
postType: React.PropTypes.string