OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3470 from kfatehi/277-confirmredact 

Confirm redactions with a dialog
pull/3473/head
Matthew Hodgson 2017-03-19 02:36:01 +00:00 committed by GitHub
parent e3e2e3a56c a9ed2e20cb
commit af122172f1
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/views/context_menus/MessageContextMenu.js
View File

@ -62,19 +62,24 @@ module.exports = React.createClass({
}, },
onRedactClick: function() { onRedactClick: function() {
MatrixClientPeg.get().redactEvent( const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
this.props.mxEvent.getRoomId(), this.props.mxEvent.getId() Modal.createDialog(ConfirmRedactDialog, {
).done(function() { onFinished: (proceed) => {
// message should disappear by itself if (!proceed) return;
}, function(e) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); MatrixClientPeg.get().redactEvent(
// display error message stating you couldn't delete this. this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
var code = e.errcode || e.statusCode; ).catch(function(e) {
Modal.createDialog(ErrorDialog, { var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
title: "Error", // display error message stating you couldn't delete this.
description: "You cannot delete this message. (" + code + ")" var code = e.errcode || e.statusCode;
}); Modal.createDialog(ErrorDialog, {
}); title: "Error",
description: "You cannot delete this message. (" + code + ")"
});
}).done();
},
}, 'mx_Dialog_confirmredact');
if (this.props.onFinished) this.props.onFinished(); if (this.props.onFinished) this.props.onFinished();
}, },

32
src/components/views/elements/ImageView.js
View File

@ -23,6 +23,8 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var DateUtils = require('matrix-react-sdk/lib/DateUtils'); var DateUtils = require('matrix-react-sdk/lib/DateUtils');
var filesize = require('filesize'); var filesize = require('filesize');
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton'); var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
const Modal = require('matrix-react-sdk/lib/Modal');
const sdk = require('matrix-react-sdk');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'ImageView', displayName: 'ImageView',
@ -62,19 +64,23 @@ module.exports = React.createClass({
}, },
onRedactClick: function() { onRedactClick: function() {
var self = this; const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
MatrixClientPeg.get().redactEvent( Modal.createDialog(ConfirmRedactDialog, {
this.props.mxEvent.getRoomId(), this.props.mxEvent.getId() onFinished: (proceed) => {
).done(function() { if (!proceed) return;
if (self.props.onFinished) self.props.onFinished(); var self = this;
}, function(e) { MatrixClientPeg.get().redactEvent(
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
// display error message stating you couldn't delete this. ).catch(function(e) {
var code = e.errcode || e.statusCode; var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { // display error message stating you couldn't delete this.
title: "Error", var code = e.errcode || e.statusCode;
description: "You cannot delete this image. (" + code + ")" Modal.createDialog(ErrorDialog, {
}); title: "Error",
description: "You cannot delete this image. (" + code + ")"
});
}).done();
}
}); });
}, },