matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Merge branch 'develop' into new-guest-access

Browse Source
This commit is contained in:
Luke Barnard
2017-06-07 12:08:37 +01:00
committed by GitHub
parent ccaa55d2c8 d59b0e1595
commit 53ea41e8a5
42 changed files with 561 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,6 @@ module.exports = React.createClass({
this.notifyNewScreen('register');
break;
case 'start_password_recovery':
if (this.state.loggedIn) return;
this.setStateForNewScreen({
screen: 'forgot_password',
});
@ -1290,7 +1289,15 @@ module.exports = React.createClass({
PlatformPeg.get().setNotificationCount(notifCount);
}
document.title = `Riot ${state === "ERROR" ? " [offline]" : ""}${notifCount > 0 ? ` [${notifCount}]` : ""}`;
let title = "Riot ";
if (state === "ERROR") {
title += `[${_t("Offline")}] `;
}
if (notifCount > 0) {
title += `[${notifCount}]`;
}
document.title = title;
},
onUserSettingsClose: function() {