diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-06-05 23:09:43 +0800 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-05 11:09:43 -0400 |
commit | b0f32e3c1928d1a125b9f7bdfd3dcbf2fede65ab (patch) | |
tree | c1eabc190d2fbb8a45981662a5effae71fdffaaa /webapp/components/create_post.jsx | |
parent | b53ca57bad4f62422f9cf4b62d54c6f508ba13cb (diff) | |
download | chat-b0f32e3c1928d1a125b9f7bdfd3dcbf2fede65ab.tar.gz chat-b0f32e3c1928d1a125b9f7bdfd3dcbf2fede65ab.tar.bz2 chat-b0f32e3c1928d1a125b9f7bdfd3dcbf2fede65ab.zip |
fix JS error and incorrect comment thread for SHIFT+UP (#6574)
Diffstat (limited to 'webapp/components/create_post.jsx')
-rw-r--r-- | webapp/components/create_post.jsx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 74104cf2a..2735718e1 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -504,11 +504,12 @@ export default class CreatePost extends React.Component { return; } + const lastPostEl = document.getElementById(this.state.channelId + 'commentIcon0'); + if (!e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey && e.keyCode === KeyCodes.UP && this.state.message === '') { e.preventDefault(); - const channelId = ChannelStore.getCurrentId(); - const lastPost = PostStore.getCurrentUsersLatestPost(channelId); + const lastPost = PostStore.getCurrentUsersLatestPost(this.state.channelId); if (!lastPost) { return; } @@ -529,15 +530,15 @@ export default class CreatePost extends React.Component { channelId: lastPost.channel_id, comments: PostStore.getCommentCount(lastPost) }); - } else if (!e.ctrlKey && !e.metaKey && !e.altKey && e.shiftKey && e.keyCode === KeyCodes.UP && this.state.message === '') { + } else if (!e.ctrlKey && !e.metaKey && !e.altKey && e.shiftKey && e.keyCode === KeyCodes.UP && this.state.message === '' && lastPostEl) { e.preventDefault(); if (document.createEvent) { - var evt = document.createEvent('MouseEvents'); + const evt = document.createEvent('MouseEvents'); evt.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); - document.getElementById('commentIcon0').dispatchEvent(evt); + lastPostEl.dispatchEvent(evt); } else if (document.createEventObject) { - var evObj = document.createEventObject(); - document.getElementById('commentIcon0').fireEvent('onclick', evObj); + const evObj = document.createEventObject(); + lastPostEl.fireEvent('onclick', evObj); } } |