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 #477 from vector-im/kegan/resending

Browse Source 
Make unsent messages behave better
This commit is contained in:
Kegsay 2015-12-07 17:00:30 +00:00
commit 862ab0c115
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/views/rooms/MessageContextMenu.js
View File

@ -57,25 +57,42 @@ module.exports = React.createClass({
if (this.props.onFinished) this.props.onFinished();
},
onCancelSendClick: function() {
Resend.removeFromQueue(this.props.mxEvent);
if (this.props.onFinished) this.props.onFinished();
},
render: function() {
var eventStatus = this.props.mxEvent.status;
var resendButton;
var viewSourceButton;
var redactButton;
var cancelButton;
if (this.props.mxEvent.status == 'not_sent') {
if (eventStatus === 'not_sent') {
resendButton = (
<div className="mx_ContextualMenu_field" onClick={this.onResendClick}>
Resend
</div>
);
}
else {
if (!eventStatus) { // sent
redactButton = (
<div className="mx_ContextualMenu_field" onClick={this.onRedactClick}>
Redact
</div>
);
}
if (eventStatus === "queued" || eventStatus === "not_sent") {
cancelButton = (
<div className="mx_ContextualMenu_field" onClick={this.onCancelSendClick}>
Cancel Sending
</div>
);
}
viewSourceButton = (
<div className="mx_ContextualMenu_field" onClick={this.onViewSourceClick}>
View Source
@ -86,6 +103,7 @@ module.exports = React.createClass({
<div>
{resendButton}
{redactButton}
{cancelButton}
{viewSourceButton}
</div>
);

2
src/skins/vector/css/molecules/EventTile.css
View File

@ -111,7 +111,7 @@ limitations under the License.
}
.mx_EventTile_notSent {
color: #ddd;
color: #f44;
}
.mx_EventTile_highlight,