Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

only show cancel option if not already sending

Browse source
This commit is contained in:
Bruno Windels 2021-06-02 11:56:15 +02:00
parent addddf1f26
commit 15f6ab8b7e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/domain/session/room/timeline/tiles/SimpleTile.js
View file

@ -49,7 +49,13 @@ export class SimpleTile extends ViewModel {
} }
get isUnsent() { get isUnsent() {
return this._entry.isPending && this._entry.status !== SendStatus.Sent; return this._entry.isPending && this._entry.pendingEvent.status !== SendStatus.Sent;
}
get canAbortSending() {
return this._entry.isPending &&
this._entry.pendingEvent.status !== SendStatus.Sending &&
this._entry.pendingEvent.status !== SendStatus.Sent;
} }
abortSending() { abortSending() {

2
src/platform/web/ui/session/room/timeline/BaseMessageView.js
View file

@ -92,7 +92,7 @@ export class BaseMessageView extends TemplateView {
createMenuOptions(vm) { createMenuOptions(vm) {
const options = []; const options = [];
if (vm.isPending) { if (vm.canAbortSending) {
options.push(Menu.option(vm.i18n`Cancel`, () => vm.abortSending())); options.push(Menu.option(vm.i18n`Cancel`, () => vm.abortSending()));
} else if (vm.canRedact) { } else if (vm.canRedact) {
options.push(Menu.option(vm.i18n`Delete`, () => vm.redact()).setDestructive()); options.push(Menu.option(vm.i18n`Delete`, () => vm.redact()).setDestructive());