Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Revert "improve lipstick and support scalar logout"
This commit is contained in:
Kegsay 2016-09-19 10:17:54 +01:00 committed by GitHub
commit 5f6cc9b37b
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

20
src/skins/vector/css/matrix-react-sdk/views/settings/IntegrationsManager.css
View File

@ -14,18 +14,20 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_IntegrationsManager .mx_Dialog { .mx_IntegrationsManager {
width: 60%; display: -webkit-flex;
height: 70%; display: flex;
overflow: hidden; width: 100%;
padding: 0px; height: 100%;
max-width: initial; -webkit-align-items: center;
max-height: initial; align-items: center;
justify-content: center;
-webkit-justify-content: center;
} }
.mx_IntegrationsManager iframe { .mx_IntegrationsManager iframe {
background-color: #fff; background-color: #fff;
border: 0px; border: 0px;
width: 100%; width: 720px;
height: 100%; height: 512px;
} }