mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge pull request #2280 from vector-im/matthew/scalar-lipstick

Browse source 
improve lipstick and support scalar logout
This commit is contained in:
Kegsay 2016-09-19 09:27:07 +01:00 • committed by GitHub
commit 1d97272874
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/settings/IntegrationsManager.js
View file

@ -19,6 +19,7 @@ limitations under the License.
var React = require('react');
var sdk = require('matrix-react-sdk');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var dis = require('matrix-react-sdk/lib/dispatcher');
module.exports = React.createClass({
displayName: 'IntegrationsManager',
@ -31,11 +32,13 @@ module.exports = React.createClass({
// XXX: keyboard shortcuts for managing dialogs should be done by the modal
// dialog base class somehow, surely...
componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction);
document.addEventListener("keydown", this.onKeyDown);
},
componentWillUnmount: function() {
document.removeEventListener("keydown", this.onKeyDown);
dis.unregister(this.dispatcherRef);
},
onKeyDown: function(ev) {
@ -46,11 +49,15 @@ module.exports = React.createClass({
}
},
onAction: function(payload) {
if (payload.action === 'close_scalar') {
this.props.onFinished();
}
},
render: function() {
return (
<div className="mx_IntegrationsManager">
<iframe src={ this.props.src }></iframe>
</div>
<iframe src={ this.props.src }></iframe>
);
}
});