OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set 

Give password confirmation correct title, description
pull/21833/head
David Baker 2017-06-14 15:16:36 +01:00 committed by GitHub
parent 602255f92c 1d4a3ae5a3
commit 449c65b784
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/dialogs/SetEmailDialog.js
View File

@ -85,6 +85,10 @@ export default React.createClass({
this.setState({emailBusy: true}); this.setState({emailBusy: true});
}, },
onCancelled: function() {
this.props.onFinished(false);
},
onEmailDialogFinished: function(ok) { onEmailDialogFinished: function(ok) {
if (ok) { if (ok) {
this.verifyEmailAddress(); this.verifyEmailAddress();
@ -133,7 +137,7 @@ export default React.createClass({
return ( return (
<BaseDialog className="mx_SetEmailDialog" <BaseDialog className="mx_SetEmailDialog"
onFinished={this.props.onFinished} onFinished={this.onCancelled}
title={this.props.title} title={this.props.title}
> >
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">