diff options
Diffstat (limited to 'webapp/components/login')
-rw-r--r-- | webapp/components/login/login_controller.jsx (renamed from webapp/components/login/login.jsx) | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login_controller.jsx index e0969001a..1b1f65436 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login_controller.jsx @@ -5,10 +5,11 @@ import LoginMfa from './components/login_mfa.jsx'; import ErrorBar from 'components/error_bar.jsx'; import FormError from 'components/form_error.jsx'; -import * as GlobalActions from 'action_creators/global_actions.jsx'; +import * as GlobalActions from 'actions/global_actions.jsx'; import UserStore from 'stores/user_store.jsx'; import Client from 'utils/web_client.jsx'; +import * as AsyncClient from 'utils/async_client.jsx'; import * as TextFormatting from 'utils/text_formatting.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -20,7 +21,7 @@ import {browserHistory, Link} from 'react-router'; import React from 'react'; import logoImage from 'images/logo.png'; -export default class Login extends React.Component { +export default class LoginController extends React.Component { constructor(props) { super(props); @@ -44,13 +45,15 @@ export default class Login extends React.Component { if (UserStore.getCurrentUser()) { browserHistory.push('/select_team'); } + + AsyncClient.checkVersion(); } preSubmit(e) { e.preventDefault(); const loginId = this.state.loginId.trim(); - const password = this.state.password.trim(); + const password = this.state.password; if (global.window.mm_config.EnableMultifactorAuthentication === 'true') { Client.checkMfa( @@ -257,6 +260,7 @@ export default class Login extends React.Component { onChange={this.handleLoginIdChange} placeholder={this.createLoginPlaceholder(emailSigninEnabled, usernameSigninEnabled, ldapEnabled)} spellCheck='false' + autoCapitalize='off' /> </div> <div className={'form-group' + errorClass}> @@ -289,7 +293,10 @@ export default class Login extends React.Component { if (global.window.mm_config.EnableOpenServer === 'true') { loginControls.push( - <div key='signup'> + <div + className='form-group' + key='signup' + > <span> <FormattedMessage id='login.noAccount' @@ -440,8 +447,8 @@ export default class Login extends React.Component { } } -Login.defaultProps = { +LoginController.defaultProps = { }; -Login.propTypes = { +LoginController.propTypes = { params: React.PropTypes.object.isRequired }; |