mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'matthew/login' into matthew/userlist

Browse source
This commit is contained in:
Matthew Hodgson 2015-09-01 02:13:52 +03:00
commit 737fc74756
5 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/templates/Login.js
View file

@ -35,7 +35,7 @@ module.exports = {
},
setStep: function(step) {
this.setState({ step: step, errorText: '', busy: false });
this.setState({ step: step, busy: false });
},
onHSChosen: function() {
@ -45,11 +45,14 @@ module.exports = {
);
this.setState({
hs_url: this.getHsUrl(),
is_url: this.getIsUrl()
is_url: this.getIsUrl(),
});
this.setStep("fetch_stages");
var cli = MatrixClientPeg.get();
this.setState({busy: true});
this.setState({
busy: true,
errorText: "",
});
var self = this;
cli.loginFlows().done(function(result) {
self.setState({
@ -66,7 +69,10 @@ module.exports = {
onUserPassEntered: function(ev) {
ev.preventDefault();
this.setState({busy: true});
this.setState({
busy: true,
errorText: "",
});
var self = this;
var formVals = this.getFormVals();