imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete

Browse source
This commit is contained in:
Aviral Dasgupta 2016-06-21 04:09:22 +05:30
commit 442291c0a4
7 changed files with 122 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/views/rooms/MemberDeviceInfo.js
View file

@ -25,8 +25,15 @@ module.exports = React.createClass({
},
onVerifyClick: function() {
MatrixClientPeg.get().setDeviceVerified(this.props.userId,
this.props.device.id);
MatrixClientPeg.get().setDeviceVerified(
this.props.userId, this.props.device.id, true
);
},
onUnverifyClick: function() {
MatrixClientPeg.get().setDeviceVerified(
this.props.userId, this.props.device.id, false
);
},
render: function() {
@ -35,9 +42,15 @@ module.exports = React.createClass({
indicator = (
<div className="mx_MemberDeviceInfo_verified">&#x2714;</div>
);
button = (
<div className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify"
onClick={this.onUnverifyClick}>
Unverify
</div>
);
} else {
button = (
<div className="mx_MemberDeviceInfo_textButton"
<div className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify"
onClick={this.onVerifyClick}>
Verify
</div>