gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into vector

This commit is contained in:
David Baker 2015-07-16 16:13:24 +01:00
parent ebe6072225 64042c9de8
commit 50edc619af
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,9 @@ module.exports = {
logged_in: false, logged_in: false,
ready: false ready: false
}); });
localStorage.removeItem("mx_hs_url"); if (window.localStorage) {
localStorage.removeItem("mx_user_id"); window.localStorage.clear();
localStorage.removeItem("mx_access_token"); }
Notifier.stop(); Notifier.stop();
MatrixClientPeg.get().removeAllListeners(); MatrixClientPeg.get().removeAllListeners();
MatrixClientPeg.replace(null); MatrixClientPeg.replace(null);

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

@ -82,10 +82,15 @@ module.exports = {
})); }));
var localStorage = window.localStorage; var localStorage = window.localStorage;
if (localStorage) { if (localStorage) {
try {
localStorage.clear();
localStorage.setItem("mx_hs_url", that.state.hs_url); localStorage.setItem("mx_hs_url", that.state.hs_url);
localStorage.setItem("mx_is_url", that.state.is_url); localStorage.setItem("mx_is_url", that.state.is_url);
localStorage.setItem("mx_user_id", data.user_id); localStorage.setItem("mx_user_id", data.user_id);
localStorage.setItem("mx_access_token", data.access_token); localStorage.setItem("mx_access_token", data.access_token);
} catch (e) {
console.warn("Error using local storage: can't persist session!");
}
} else { } else {
console.warn("No local storage available: can't persist session!"); console.warn("No local storage available: can't persist session!");
} }