gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oops, make this actually work.

This commit is contained in:
Matthew Hodgson 2015-11-11 00:06:49 +01:00
parent 801154fd8a
commit 19b31ff30d
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/skins/vector/views/templates/Login.js
View File

@ -29,23 +29,22 @@ module.exports = React.createClass({
displayName: 'Login', displayName: 'Login',
mixins: [LoginController], mixins: [LoginController],
componentWillMount: function() { getInitialState: function() {
// TODO: factor out all localstorage stuff into its own home. // TODO: factor out all localstorage stuff into its own home.
// This is common to Login, Register and MatrixClientPeg // This is common to Login, Register and MatrixClientPeg
var localStorage = window.localStorage; var localStorage = window.localStorage;
var hs_url, is_url;
if (localStorage) { if (localStorage) {
var hs_url = localStorage.getItem("mx_hs_url"); hs_url = localStorage.getItem("mx_hs_url");
var is_url = localStorage.getItem("mx_is_url"); is_url = localStorage.getItem("mx_is_url");
} }
this.setState({ return {
customHsUrl: hs_url || config.default_hs_url, customHsUrl: hs_url || config.default_hs_url,
customIsUrl: is_url || config.default_is_url, customIsUrl: is_url || config.default_is_url,
serverConfigVisible: (hs_url !== config.default_hs_url || serverConfigVisible: (hs_url && hs_url !== config.default_hs_url ||
is_url !== config.default_is_url) is_url && is_url !== config.default_is_url)
}); }
this.onHSChosen();
}, },
getHsUrl: function() { getHsUrl: function() {
@ -147,7 +146,7 @@ module.exports = React.createClass({
return ( return (
<div> <div>
<form onSubmit={this.onUserPassEntered}> <form onSubmit={this.onUserPassEntered}>
<input className="mx_Login_field" ref="user" type="text" value={this.state.username} onChange={this.onUsernameChanged} placeholder="Email or user name" /><br /> <input className="mx_Login_field" autoFocus={true} ref="user" type="text" value={this.state.username} onChange={this.onUsernameChanged} placeholder="Email or user name" /><br />
<input className="mx_Login_field" ref="pass" type="password" value={this.state.password} onChange={this.onPasswordChanged} placeholder="Password" /><br /> <input className="mx_Login_field" ref="pass" type="password" value={this.state.password} onChange={this.onPasswordChanged} placeholder="Password" /><br />
{ this.componentForStep('choose_hs') } { this.componentForStep('choose_hs') }
<input className="mx_Login_submit" type="submit" value="Log in" /> <input className="mx_Login_submit" type="submit" value="Log in" />

26
src/skins/vector/views/templates/Register.js
View File

@ -29,21 +29,29 @@ module.exports = React.createClass({
displayName: 'Register', displayName: 'Register',
mixins: [RegisterController], mixins: [RegisterController],
componentWillMount: function() { getInitialState: function() {
// TODO: factor out all localstorage stuff into its own home. // TODO: factor out all localstorage stuff into its own home.
// This is common to Login, Register and MatrixClientPeg // This is common to Login, Register and MatrixClientPeg
var localStorage = window.localStorage; var localStorage = window.localStorage;
var hs_url, is_url;
if (localStorage) { if (localStorage) {
var hs_url = localStorage.getItem("mx_hs_url"); hs_url = localStorage.getItem("mx_hs_url");
var is_url = localStorage.getItem("mx_is_url"); is_url = localStorage.getItem("mx_is_url");
} }
this.setState({ // make sure we have our MatrixClient set up whatever
// Useful for debugging only.
// MatrixClientPeg.replaceUsingUrls(
// hs_url || config.default_hs_url,
// is_url || config.default_is_url
// );
return {
customHsUrl: hs_url || config.default_hs_url, customHsUrl: hs_url || config.default_hs_url,
customIsUrl: is_url || config.default_is_url, customIsUrl: is_url || config.default_is_url,
serverConfigVisible: (hs_url !== config.default_hs_url || serverConfigVisible: (hs_url && hs_url !== config.default_hs_url ||
is_url !== config.default_is_url) is_url && is_url !== config.default_is_url)
}); }
}, },
getRegFormVals: function() { getRegFormVals: function() {
@ -98,12 +106,12 @@ module.exports = React.createClass({
return ( return (
<div> <div>
<form onSubmit={this.onInitialStageSubmit}> <form onSubmit={this.onInitialStageSubmit}>
<input className="mx_Login_field" type="text" ref="email" placeholder="Email address" defaultValue={this.savedParams.email} /><br /> <input className="mx_Login_field" type="text" ref="email" autoFocus={true} placeholder="Email address" defaultValue={this.savedParams.email} /><br />
<input className="mx_Login_field" type="text" ref="username" placeholder="User name" defaultValue={this.savedParams.username} /><br /> <input className="mx_Login_field" type="text" ref="username" placeholder="User name" defaultValue={this.savedParams.username} /><br />
<input className="mx_Login_field" type="password" ref="password" placeholder="Password" defaultValue={this.savedParams.password} /><br /> <input className="mx_Login_field" type="password" ref="password" placeholder="Password" defaultValue={this.savedParams.password} /><br />
<input className="mx_Login_field" type="password" ref="confirmPassword" placeholder="Confirm password" defaultValue={this.savedParams.confirmPassword} /><br /> <input className="mx_Login_field" type="password" ref="confirmPassword" placeholder="Confirm password" defaultValue={this.savedParams.confirmPassword} /><br />
<input className="mx_Login_checkbox" id="advanced" type="checkbox" value={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} /> <input className="mx_Login_checkbox" id="advanced" type="checkbox" checked={this.state.serverConfigVisible} onChange={this.onServerConfigVisibleChange} />
<label htmlFor="advanced">Use custom server options (advanced)</label> <label htmlFor="advanced">Use custom server options (advanced)</label>
<div style={serverConfigStyle}> <div style={serverConfigStyle}>
<ServerConfig ref="serverConfig" <ServerConfig ref="serverConfig"