diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-12-15 11:47:52 -0500 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-12-15 11:47:52 -0500 |
commit | 23af326af20cffef59ac8859e7def38f744a452b (patch) | |
tree | 62bf9536521fdf3463de305a3cf892b4ef7cc182 /web/react | |
parent | e4899fa551d53ec07718659eed97178052982552 (diff) | |
download | chat-23af326af20cffef59ac8859e7def38f744a452b.tar.gz chat-23af326af20cffef59ac8859e7def38f744a452b.tar.bz2 chat-23af326af20cffef59ac8859e7def38f744a452b.zip |
Stopped CreatePost from responding to PreferenceStore changes before it gets mounted
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/create_post.jsx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index e54f1016d..e901b272a 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -52,7 +52,6 @@ export default class CreatePost extends React.Component { PostStore.clearDraftUploads(); const draft = this.getCurrentDraft(); - const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999); this.state = { channelId: ChannelStore.getCurrentId(), @@ -63,11 +62,9 @@ export default class CreatePost extends React.Component { initialText: draft.messageText, windowWidth: Utils.windowWidth(), windowHeight: Utils.windowHeight(), - ctrlSend: PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter'), - showTutorialTip: tutorialStep === TutorialSteps.POST_POPOVER + ctrlSend: false, + showTutorialTip: false }; - - PreferenceStore.addChangeListener(this.onPreferenceChange); } handleResize() { this.setState({ @@ -313,6 +310,15 @@ export default class CreatePost extends React.Component { this.setState({previews, uploadsInProgress}); } + componentWillMount() { + const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999); + + // wait to load these since they may have changed since the component was constructed (particularly in the case of skipping the tutorial) + this.setState({ + ctrlSend: PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'send_on_ctrl_enter'), + showTutorialTip: tutorialStep === TutorialSteps.POST_POPOVER + }); + } componentDidMount() { ChannelStore.addChangeListener(this.onChange); PreferenceStore.addChangeListener(this.onPreferenceChange); |