Merge remote-tracking branch 'origin/develop' into dbkr/translations

matrix-org · May 26, 2017 · 97aeb57 · 97aeb57
2 parents 62ffe92 + 276d3ca
commit 97aeb57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 35 deletions.
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
@@ -20,7 +20,6 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import ReactDOM from 'react-dom';
-import url from 'url';
 import sdk from '../../../index';
 import Login from '../../../Login';
 
@@ -245,12 +244,6 @@ module.exports = React.createClass({
         switch (step) {
             case 'm.login.password':
                 const PasswordLogin = sdk.getComponent('login.PasswordLogin');
-                // HSs that are not matrix.org may not be configured to have their
-                // domain name === domain part.
-                let hsDomain = url.parse(this.state.enteredHomeserverUrl).hostname;
-                if (hsDomain !== 'matrix.org') {
-                    hsDomain = null;
-                }
                 return (
                     <PasswordLogin
                         onSubmit={this.onPasswordLogin}
@@ -262,7 +255,6 @@ module.exports = React.createClass({
                         onPhoneNumberChanged={this.onPhoneNumberChanged}
                         onForgotPasswordClick={this.props.onForgotPasswordClick}
                         loginIncorrect={this.state.loginIncorrect}
-                        hsDomain={hsDomain}
                     />
                 );
             case 'm.login.cas':

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
@@ -122,32 +122,16 @@ class PasswordLogin extends React.Component {
                     autoFocus
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
-                const mxidInputClasses = classNames({
-                    "mx_Login_field": true,
-                    "mx_Login_username": true,
-                    "mx_Login_field_has_prefix": true,
-                    "mx_Login_field_has_suffix": Boolean(this.props.hsDomain),
-                });
-                let suffix = null;
-                if (this.props.hsDomain) {
-                    suffix = <div className="mx_Login_field_suffix">
-                        :{this.props.hsDomain}
-                    </div>;
-                }
-                return <div className="mx_Login_field_group">
-                    <div className="mx_Login_field_prefix">@</div>
-                    <input
-                        className={mxidInputClasses}
-                        key="username_input"
-                        type="text"
-                        name="username" // make it a little easier for browser's remember-password
-                        onChange={this.onUsernameChanged}
-                        placeholder={_t('username')}
-                        value={this.state.username}
-                        autoFocus
-                    />
-                    {suffix}
-                </div>;
+                return <input
+                    className="mx_Login_field mx_Login_username"
+                    key="username_input"
+                    type="text"
+                    name="username" // make it a little easier for browser's remember-password
+                    onChange={this.onUsernameChanged}
+                    placeholder=_t('username')
+                    value={this.state.username}
+                    autoFocus
+                />;
             case PasswordLogin.LOGIN_FIELD_PHONE:
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
                 return <div className="mx_Login_phoneSection">
@@ -238,7 +222,6 @@ PasswordLogin.propTypes = {
     onPhoneNumberChanged: React.PropTypes.func,
     onPasswordChanged: React.PropTypes.func,
     loginIncorrect: React.PropTypes.bool,
-    hsDomain: React.PropTypes.string,
 };
 
 module.exports = PasswordLogin;