diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
commit | 05d95d80a896d14474c7f7384d67b9edd524b922 (patch) | |
tree | 2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/components/create_post.jsx | |
parent | 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff) | |
parent | 4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff) | |
download | chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2 chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip |
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/components/create_post.jsx')
-rw-r--r-- | web/react/components/create_post.jsx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index ce4ebac9e..871b72a43 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -117,7 +117,6 @@ export default class CreatePost extends React.Component { Client.createPost(post, channel, function handlePostSuccess(data) { - this.resizePostHolder(); AsyncClient.getPosts(); let member = ChannelStore.getMember(channel.id); @@ -129,7 +128,7 @@ export default class CreatePost extends React.Component { type: ActionTypes.RECIEVED_POST, post: data }); - }.bind(this), + }, function handlePostError(err) { let state = {}; @@ -149,9 +148,6 @@ export default class CreatePost extends React.Component { ); } } - componentDidUpdate() { - this.resizePostHolder(); - } postMsgKeyPress(e) { if (e.which === 13 && !e.shiftKey && !e.altKey) { e.preventDefault(); @@ -166,7 +162,6 @@ export default class CreatePost extends React.Component { } } handleUserInput(messageText) { - this.resizePostHolder(); this.setState({messageText: messageText}); let draft = PostStore.getCurrentDraft(); @@ -296,7 +291,8 @@ export default class CreatePost extends React.Component { <FilePreview files={this.state.previews} onRemove={this.removePreview} - uploadsInProgress={this.state.uploadsInProgress} /> + uploadsInProgress={this.state.uploadsInProgress} + /> ); } @@ -317,11 +313,13 @@ export default class CreatePost extends React.Component { <Textbox onUserInput={this.handleUserInput} onKeyPress={this.postMsgKeyPress} + onHeightChange={this.resizePostHolder} messageText={this.state.messageText} createMessage='Write a message...' channelId={this.state.channelId} id='post_textbox' - ref='textbox' /> + ref='textbox' + /> <FileUpload ref='fileUpload' getFileCount={this.getFileCount} @@ -329,7 +327,8 @@ export default class CreatePost extends React.Component { onFileUpload={this.handleFileUploadComplete} onUploadError={this.handleUploadError} postType='post' - channelId='' /> + channelId='' + /> </div> <div className={postFooterClassName}> {postError} |