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

Various fixes

pull/21833/head
Luke Barnard 2017-02-28 15:18:00 +00:00
parent 48a3d0d595
commit 0ef8e2a8f4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/MatrixChat.js
View File

@ -1131,7 +1131,6 @@ module.exports = React.createClass({
customIsUrl={this.getCurrentIsUrl()} customIsUrl={this.getCurrentIsUrl()}
registrationUrl={this.props.registrationUrl} registrationUrl={this.props.registrationUrl}
defaultDeviceDisplayName={this.props.defaultDeviceDisplayName} defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
onTeamMemberRegistered={this.onTeamMemberRegistered}
onLoggedIn={this.onRegistered} onLoggedIn={this.onRegistered}
onLoginClick={this.onLoginClick} onLoginClick={this.onLoginClick}
onRegisterClick={this.onRegisterClick} onRegisterClick={this.onRegisterClick}

9
src/components/structures/login/Registration.js
View File

@ -60,7 +60,6 @@ module.exports = React.createClass({
teamServerURL: React.PropTypes.string.isRequired, teamServerURL: React.PropTypes.string.isRequired,
}), }),
teamSelected: React.PropTypes.object, teamSelected: React.PropTypes.object,
onTeamMemberRegistered: React.PropTypes.func.isRequired,
defaultDeviceDisplayName: React.PropTypes.string, defaultDeviceDisplayName: React.PropTypes.string,
@ -259,7 +258,7 @@ module.exports = React.createClass({
identityServerUrl: self.registerLogic.getIdentityServerUrl(), identityServerUrl: self.registerLogic.getIdentityServerUrl(),
accessToken: response.access_token accessToken: response.access_token
}, teamToken); }, teamToken);
}).done(() => { }).then(() => {
self._setupPushers(); self._setupPushers();
}); });
}, function(err) { }, function(err) {
@ -276,7 +275,7 @@ module.exports = React.createClass({
}, },
_setupPushers: function() { _setupPushers: function() {
if (!self.props.brand) { if (!this.props.brand) {
return; return;
} }
MatrixClientPeg.get().getPushers().done((resp)=>{ MatrixClientPeg.get().getPushers().done((resp)=>{
@ -284,9 +283,9 @@ module.exports = React.createClass({
for (var i = 0; i < pushers.length; ++i) { for (var i = 0; i < pushers.length; ++i) {
if (pushers[i].kind == 'email') { if (pushers[i].kind == 'email') {
var emailPusher = pushers[i]; var emailPusher = pushers[i];
emailPusher.data = { brand: self.props.brand }; emailPusher.data = { brand: this.props.brand };
MatrixClientPeg.get().setPusher(emailPusher).done(() => { MatrixClientPeg.get().setPusher(emailPusher).done(() => {
console.log("Set email branding to " + self.props.brand); console.log("Set email branding to " + this.props.brand);
}, (error) => { }, (error) => {
console.error("Couldn't set email branding: " + error); console.error("Couldn't set email branding: " + error);
}); });