Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog

Show UDDialog on UDE during VoIP calls
This commit is contained in:
David Baker 2017-03-02 13:13:45 +00:00 committed by GitHub
commit 95cff17698
7 changed files with 82 additions and 38 deletions

View file

@ -41,6 +41,7 @@ var Lifecycle = require('../../Lifecycle');
var PageTypes = require('../../PageTypes');
var createRoom = require("../../createRoom");
import * as UDEHandler from '../../UnknownDeviceErrorHandler';
module.exports = React.createClass({
displayName: 'MatrixChat',
@ -239,6 +240,7 @@ module.exports = React.createClass({
componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction);
UDEHandler.startListening();
this.focusComposer = false;
window.addEventListener("focus", this.onFocus);
@ -285,6 +287,7 @@ module.exports = React.createClass({
componentWillUnmount: function() {
Lifecycle.stopMatrixClient();
dis.unregister(this.dispatcherRef);
UDEHandler.stopListening();
window.removeEventListener("focus", this.onFocus);
window.removeEventListener('resize', this.handleResize);
},