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

logic to show/hide toolbar shifted to MatrixChat::render 

Signed-off-by: Minhaz A V <minhazav@gmail.com>
pull/21833/head
Minhaz A V 2016-03-23 15:17:07 +05:30
parent cbcf23f30a
commit 349b472056
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1046,7 +1046,7 @@ module.exports = React.createClass({
if (MatrixClientPeg.get().isGuest()) { if (MatrixClientPeg.get().isGuest()) {
topBar = <GuestWarningBar />; topBar = <GuestWarningBar />;
} }
else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) { else if (Notifier.supportsDesktopNotifications() && Notifier.shouldShowToolbar()) {
topBar = <MatrixToolbar />; topBar = <MatrixToolbar />;
} }
else if (this.state.hasNewVersion) { else if (this.state.hasNewVersion) {