PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3791 from matrix-org/dbkr/remove_e2etile_onclick

Browse source 
Remove E2eIcon onClick
This commit is contained in:
David Baker 2020-01-02 17:16:25 +00:00 committed by GitHub
commit 560cff0ae1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/rooms/_EventTile.scss
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -353,7 +354,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
left: 46px; left: 46px;
width: 15px; width: 15px;
height: 15px; height: 15px;
cursor: pointer;
display: block; display: block;
bottom: 0; bottom: 0;
right: 0; right: 0;

24
src/components/views/rooms/EventTile.js
View file

@ -1,8 +1,8 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 New Vector Ltd Copyright 2017 New Vector Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Copyright 2019 Michael Telatynski <7t3chguy@gmail.com> Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -24,7 +24,6 @@ import PropTypes from 'prop-types';
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
const classNames = require("classnames"); const classNames = require("classnames");
import { _t, _td } from '../../../languageHandler'; import { _t, _td } from '../../../languageHandler';
const Modal = require('../../../Modal');
const sdk = require('../../../index'); const sdk = require('../../../index');
const TextForEvent = require('../../../TextForEvent'); const TextForEvent = require('../../../TextForEvent');
@ -443,15 +442,6 @@ module.exports = createReactClass({
}); });
}, },
onCryptoClick: function(e) {
const event = this.props.mxEvent;
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
import('../../../async-components/views/dialogs/EncryptedEventDialog'),
{event},
);
},
onRequestKeysClick: function() { onRequestKeysClick: function() {
this.setState({ this.setState({
// Indicate in the UI that the keys have been requested (this is expected to // Indicate in the UI that the keys have been requested (this is expected to
@ -479,11 +469,10 @@ module.exports = createReactClass({
_renderE2EPadlock: function() { _renderE2EPadlock: function() {
const ev = this.props.mxEvent; const ev = this.props.mxEvent;
const props = {onClick: this.onCryptoClick};
// event could not be decrypted // event could not be decrypted
if (ev.getContent().msgtype === 'm.bad.encrypted') { if (ev.getContent().msgtype === 'm.bad.encrypted') {
return <E2ePadlockUndecryptable {...props} />; return <E2ePadlockUndecryptable />;
} }
// event is encrypted, display padlock corresponding to whether or not it is verified // event is encrypted, display padlock corresponding to whether or not it is verified
@ -491,7 +480,7 @@ module.exports = createReactClass({
if (this.state.verified) { if (this.state.verified) {
return; // no icon for verified return; // no icon for verified
} else { } else {
return (<E2ePadlockUnverified {...props} />); return (<E2ePadlockUnverified />);
} }
} }
@ -508,7 +497,7 @@ module.exports = createReactClass({
return; // we expect this to be unencrypted return; // we expect this to be unencrypted
} }
// if the event is not encrypted, but it's an e2e room, show the open padlock // if the event is not encrypted, but it's an e2e room, show the open padlock
return <E2ePadlockUnencrypted {...props} />; return <E2ePadlockUnencrypted />;
} }
// no padlock needed // no padlock needed
@ -920,7 +909,6 @@ class E2ePadlock extends React.Component {
static propTypes = { static propTypes = {
icon: PropTypes.string.isRequired, icon: PropTypes.string.isRequired,
title: PropTypes.string.isRequired, title: PropTypes.string.isRequired,
onClick: PropTypes.func,
}; };
constructor() { constructor() {
@ -931,10 +919,6 @@ class E2ePadlock extends React.Component {
}; };
} }
onClick = (e) => {
if (this.props.onClick) this.props.onClick(e);
};
onHoverStart = () => { onHoverStart = () => {
this.setState({hover: true}); this.setState({hover: true});
}; };