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

Fix the client-peg clean up to match the changes vector has made to the sdk

pull/1/head
Mark Haines 2015-07-20 14:19:13 +01:00
parent d8494ff89b
commit 28022534f7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MatrixClientPeg.js
View File

@ -49,6 +49,10 @@ module.exports = {
return matrixClient; return matrixClient;
}, },
unset: function() {
matrixClient = null;
},
replaceUsingUrls: function(hs_url, is_url) { replaceUsingUrls: function(hs_url, is_url) {
matrixClient = Matrix.createClient({ matrixClient = Matrix.createClient({
baseUrl: hs_url, baseUrl: hs_url,

2
src/controllers/pages/MatrixChat.js
View File

@ -90,7 +90,7 @@ module.exports = {
} }
Notifier.stop(); Notifier.stop();
MatrixClientPeg.get().removeAllListeners(); MatrixClientPeg.get().removeAllListeners();
MatrixClientPeg.replace(null); MatrixClientPeg.unset();
break; break;
case 'start_registration': case 'start_registration':
if (this.state.logged_in) return; if (this.state.logged_in) return;

6
src/controllers/templates/Login.js
View File

@ -76,11 +76,11 @@ module.exports = {
'password': formVals.password 'password': formVals.password
}).done(function(data) { }).done(function(data) {
MatrixClientPeg.replaceUsingAccessToken( MatrixClientPeg.replaceUsingAccessToken(
that.state.hs_url, that.state.is_url, self.state.hs_url, self.state.is_url,
data.user_id, data.access_token data.user_id, data.access_token
); );
if (that.props.onLoggedIn) { if (self.props.onLoggedIn) {
that.props.onLoggedIn(); self.props.onLoggedIn();
} }
}, function(error) { }, function(error) {
self.setStep("stage_m.login.password"); self.setStep("stage_m.login.password");