summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-06 12:25:26 -0400
committerCorey Hulen <corey@hulen.com>2016-07-06 08:25:26 -0800
commit2b60c96994a99676ddaaff7eabaef061c0075755 (patch)
treec69e42aaed7247970f59c9eee5d19a92b59baf74
parentf44dc649a933ac52a3dfc0640403235668ae5cd1 (diff)
downloadchat-2b60c96994a99676ddaaff7eabaef061c0075755.tar.gz
chat-2b60c96994a99676ddaaff7eabaef061c0075755.tar.bz2
chat-2b60c96994a99676ddaaff7eabaef061c0075755.zip
Changed EditChannelHeaderModal to only change it's displayed text when the user isn't editing it (#3503)
-rw-r--r--webapp/components/edit_channel_header_modal.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/edit_channel_header_modal.jsx b/webapp/components/edit_channel_header_modal.jsx
index 394c0e21c..cfc89500d 100644
--- a/webapp/components/edit_channel_header_modal.jsx
+++ b/webapp/components/edit_channel_header_modal.jsx
@@ -54,7 +54,7 @@ class EditChannelHeaderModal extends React.Component {
}
componentWillReceiveProps(nextProps) {
- if (this.props !== nextProps) {
+ if (this.props.channel.header !== nextProps.channel.header && !this.props.show) {
this.setState({
header: nextProps.channel.header,
submitted: false