diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-01 08:49:54 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-01 08:49:54 -0400 |
| commit | 72575ac7bdd5bfe7bd544ba238f8d1c0126635aa (patch) | |
| tree | f1ed51dfc87879e73261625f3afb4d4169e2a3f8 /web/react/components | |
| parent | 0b3db018d33601a44c86d08771441c5dacd18969 (diff) | |
| parent | 8d6c35481124d7e30bdb559f440c48b3e5eb4e0d (diff) | |
| download | chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.tar.gz chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.tar.bz2 chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.zip | |
Merging release branch 'release-0.7.0'
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/login.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/sidebar.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/team_signup_password_page.jsx | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 0f3aa42db..28dd64c39 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -152,7 +152,6 @@ export default class Login extends React.Component { ); } - var forgotPassword; if (loginMessage.length > 0 && emailSignup) { loginMessage = ( <div> @@ -162,7 +161,10 @@ export default class Login extends React.Component { </div> </div> ); + } + var forgotPassword; + if (emailSignup) { forgotPassword = ( <div className='form-group'> <a href={'/' + teamName + '/reset_password'}>I forgot my password</a> diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 8dd192893..5b74165f3 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -278,7 +278,6 @@ module.exports = React.createClass({ var lastUnreadElement = $(this.refs[this.lastUnreadChannel].getDOMNode()); if (lastUnreadElement.position().top > container.height()) { - $(this.refs.bottomUnreadIndicator.getDOMNode()).css('bottom', '0'); $(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'initial'); } else { $(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'none'); diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx index bbe82a5c2..6b21915f6 100644 --- a/web/react/components/team_signup_password_page.jsx +++ b/web/react/components/team_signup_password_page.jsx @@ -57,13 +57,14 @@ module.exports = React.createClass({ window.location.href = '/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name); } else { this.setState({serverError: err.message}); + $('#finish-button').button('reset'); } }.bind(this) ); }.bind(this), function error(err) { this.setState({serverError: err.message}); - $('#sign-up-button').button('reset'); + $('#finish-button').button('reset'); }.bind(this) ); }, |