From 7b70892c75aec62a7b4fa326b08fbda26d4e3262 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 2 Sep 2015 16:42:20 -0700 Subject: Moved componentWillMount logic into the constructor of the react components it was used in --- web/react/components/team_signup_send_invites_page.jsx | 11 +++++------ web/react/components/team_signup_welcome_page.jsx | 5 ++--- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/team_signup_send_invites_page.jsx b/web/react/components/team_signup_send_invites_page.jsx index 35d2441c5..11a9980d7 100644 --- a/web/react/components/team_signup_send_invites_page.jsx +++ b/web/react/components/team_signup_send_invites_page.jsx @@ -18,6 +18,11 @@ export default class TeamSignupSendInvitesPage extends React.Component { this.state = { emailEnabled: !ConfigStore.getSettingAsBoolean('ByPassEmail', false) }; + + if (!this.state.emailEnabled) { + this.props.state.wizard = 'username'; + this.props.updateParent(this.props.state); + } } submitBack(e) { e.preventDefault(); @@ -75,12 +80,6 @@ export default class TeamSignupSendInvitesPage extends React.Component { this.submitNext(e); } } - componentWillMount() { - if (!this.state.emailEnabled) { - this.props.state.wizard = 'username'; - this.props.updateParent(this.props.state); - } - } componentDidMount() { if (!this.state.emailEnabled) { // Must use keypress not keyup due to event chain of pressing enter diff --git a/web/react/components/team_signup_welcome_page.jsx b/web/react/components/team_signup_welcome_page.jsx index e4374fa28..43b7aea0e 100644 --- a/web/react/components/team_signup_welcome_page.jsx +++ b/web/react/components/team_signup_welcome_page.jsx @@ -16,6 +16,8 @@ export default class TeamSignupWelcomePage extends React.Component { this.handleKeyPress = this.handleKeyPress.bind(this); this.state = {useDiff: false}; + + document.addEventListener('keyup', this.handleKeyPress, false); } submitNext(e) { if (!BrowserStore.isLocalStorageSupported()) { @@ -68,9 +70,6 @@ export default class TeamSignupWelcomePage extends React.Component { this.submitNext(event); } } - componentWillMount() { - document.addEventListener('keyup', this.handleKeyPress, false); - } componentWillUnmount() { document.removeEventListener('keyup', this.handleKeyPress, false); } -- cgit v1.2.3-1-g7c22