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

Fix syntax

pull/1/head
Mark Haines 2015-07-20 13:48:40 +01:00
parent 3f5c220993
commit b66488a783
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MatrixClientPeg.js
View File

@ -40,7 +40,7 @@ if (localStorage) {
var access_token = localStorage.getItem("mx_access_token"); var access_token = localStorage.getItem("mx_access_token");
var user_id = localStorage.getItem("mx_user_id"); var user_id = localStorage.getItem("mx_user_id");
if (access_token && user_id && hs_url) { if (access_token && user_id && hs_url) {
matrixClient = createClient(hs_url, is_url, user_id, access_token); createClient(hs_url, is_url, user_id, access_token);
} }
} }
@ -54,10 +54,10 @@ module.exports = {
baseUrl: hs_url, baseUrl: hs_url,
idBaseUrl: is_url idBaseUrl: is_url
}); });
} },
replaceUsingAccessToken: function(hs_url, is_url, user_id, access_token) { replaceUsingAccessToken: function(hs_url, is_url, user_id, access_token) {
matrixClient = createClient(hs_url, is_url, user_id, access_token); createClient(hs_url, is_url, user_id, access_token);
if (localStorage) { if (localStorage) {
try { try {
localStorage.clear(); localStorage.clear();

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

@ -77,10 +77,9 @@ module.exports = {
'password': formVals.password 'password': formVals.password
}).done(function(data) { }).done(function(data) {
MatrixClientPeg.replaceUsingAccessToken( MatrixClientPeg.replaceUsingAccessToken(
this.state.hs_url, this.state.is_url, that.state.hs_url, that.state.is_url,
data.user_id, data.access_token data.user_id, data.access_token
); );
}));
if (that.props.onLoggedIn) { if (that.props.onLoggedIn) {
that.props.onLoggedIn(); that.props.onLoggedIn();
} }