diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-15 11:05:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 11:05:43 -0400 |
commit | 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c (patch) | |
tree | 71fa9b677ce72050dca3abc3c9243e6cf39e0278 /webapp/components/create_post.jsx | |
parent | c0a0065472c199166d32b052dd328b0212f5b693 (diff) | |
download | chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.gz chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.bz2 chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.zip |
Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)
* Fix quick switcher for channels/users not stored locally (#6610)
* Fix button text on confirm mention modal (#6609)
* fix post delete permission of channel admin (#6608)
* open comment thread for the most recent reply-able message (#6605)
* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)
* Use mutex flag with yarn to prevent concurrent builds interfering
* Remove yarn mutex file with clean
* Minor bug fixes (#6615)
* PLT-6774 - Fixing color for offline icon
* PLT-6784 - Fixing status icon
* Fixing icon margin
* Updating caret position
* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)
* Fixing JS error (#6623)
* Minor bug fixes (#6622)
* PLT-6808 - Updating channel switcher on mobile
* PLT-6743 - Updating scrollbar styling
* Login instead of failing if user exists in OAuth sign-up flow (#6627)
* PLT-6802 Disable team switcher (#6626)
* Disable team switcher
* Fix ESLint errors
* PLT-6807 Ensured select teams page can scroll on iOS (#6630)
* Do not redirect from account switch pages on 401 (#6631)
* Fixing loadtest command and renaming to /test (#6624)
* PLT-6820 Update mattermost-redux dependency (#6632)
* translations PR 20170612 (#6629)
* Bump HTTP client timeout to 30 seconds (#6633)
* For team unreads return empty array instead of null (#6636)
* PLT-6831 Fix status modal localization IDs (#6637)
* Fix status modal localization IDs
* Update test snapshot
Diffstat (limited to 'webapp/components/create_post.jsx')
-rw-r--r-- | webapp/components/create_post.jsx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 09741706c..d2f64a266 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -115,6 +115,10 @@ export default class CreatePost extends React.Component { e.preventDefault(); } + if (this.state.uploadsInProgress.length > 0 || this.state.submitting) { + return; + } + const post = {}; post.file_ids = []; post.message = this.state.message; @@ -493,7 +497,9 @@ export default class CreatePost extends React.Component { return; } - const lastPostEl = document.getElementById(this.state.channelId + 'commentIcon0'); + const latestNonEphemeralPost = PostStore.getLatestNonEphemeralPost(this.state.channelId); + const latestNonEphemeralPostId = latestNonEphemeralPost == null ? '' : latestNonEphemeralPost.id; + const lastPostEl = document.getElementById(`commentIcon_${this.state.channelId}_${latestNonEphemeralPostId}`); if (!e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey && e.keyCode === KeyCodes.UP && this.state.message === '') { e.preventDefault(); @@ -761,7 +767,7 @@ export default class CreatePost extends React.Component { <ConfirmModal title={notifyAllTitle} message={notifyAllMessage} - confirmButton={notifyAllConfirm} + confirmButtonText={notifyAllConfirm} show={this.state.showConfirmModal} onConfirm={this.handleNotifyAllConfirmation} onCancel={this.handleNotifyModalCancel} |