summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-30 13:45:58 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-03-30 13:45:58 -0400
commit4092836c94a7b47584b0f32e2eeccafd38bc0e3d (patch)
tree92f38afcaf60eba0fa32f80c0102d641afbe8093 /webapp
parent364543c05bfe65f2573608fbf2549c80da52c905 (diff)
downloadchat-4092836c94a7b47584b0f32e2eeccafd38bc0e3d.tar.gz
chat-4092836c94a7b47584b0f32e2eeccafd38bc0e3d.tar.bz2
chat-4092836c94a7b47584b0f32e2eeccafd38bc0e3d.zip
PLT-1990 Closed markdown preview when edit post modal is closed (#5921)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/edit_post_modal.jsx2
-rw-r--r--webapp/components/textbox.jsx4
2 files changed, 6 insertions, 0 deletions
diff --git a/webapp/components/edit_post_modal.jsx b/webapp/components/edit_post_modal.jsx
index b2b607428..902b18d30 100644
--- a/webapp/components/edit_post_modal.jsx
+++ b/webapp/components/edit_post_modal.jsx
@@ -184,6 +184,8 @@ export default class EditPostModal extends React.Component {
}
onModalHide() {
+ this.refs.editbox.hidePreview();
+
if (this.state.refocusId !== '') {
setTimeout(() => {
const element = $(this.state.refocusId).get(0);
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index 7f3dc1891..21f784af5 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -157,6 +157,10 @@ export default class Textbox extends React.Component {
this.setState({preview: !this.state.preview});
}
+ hidePreview() {
+ this.setState({preview: false});
+ }
+
componentWillReceiveProps(nextProps) {
if (nextProps.channelId !== this.props.channelId) {
// Update channel id for AtMentionProvider.