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

Merge pull request #2844 from jryans/notifier-delay-prepared 

Delay `Notifier` check until we have push rules
pull/21833/head
J. Ryan Stinnett 2019-03-29 15:31:16 +00:00 committed by GitHub
parent a326c83016 6e79cbc092
commit 13e922dc93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ export default React.createClass({
syncError: null, // If the current syncing status is ERROR, the error object, otherwise null. syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
resizeNotifier: new ResizeNotifier(), resizeNotifier: new ResizeNotifier(),
showNotifierToolbar: Notifier.shouldShowToolbar(), showNotifierToolbar: false,
}; };
return s; return s;
}, },
@ -1197,8 +1197,7 @@ export default React.createClass({
* Called when a new logged in session has started * Called when a new logged in session has started
*/ */
_onLoggedIn: async function() { _onLoggedIn: async function() {
this.setStateForNewView({view: VIEWS.LOGGED_IN}); this.setStateForNewView({ view: VIEWS.LOGGED_IN });
this.setState({showNotifierToolbar: Notifier.shouldShowToolbar()});
if (this._is_registered) { if (this._is_registered) {
this._is_registered = false; this._is_registered = false;
@ -1342,7 +1341,10 @@ export default React.createClass({
self.firstSyncPromise.resolve(); self.firstSyncPromise.resolve();
dis.dispatch({action: 'focus_composer'}); dis.dispatch({action: 'focus_composer'});
self.setState({ready: true}); self.setState({
ready: true,
showNotifierToolbar: Notifier.shouldShowToolbar(),
});
}); });
cli.on('Call.incoming', function(call) { cli.on('Call.incoming', function(call) {
// we dispatch this synchronously to make sure that the event // we dispatch this synchronously to make sure that the event