From 2ef35d0b50fca5c1e9f8069ecaf1bde68a74bb07 Mon Sep 17 00:00:00 2001 From: GabrielMeyer Date: Wed, 6 Feb 2019 14:41:55 +0100 Subject: [PATCH] Prevent dialogs to close easily (Fixes #4116) dialogs (created by MatDialog) should only close if the user explicit clicks 'x' or 'cancel' now --- client/src/app/core/ui-services/choice.service.ts | 1 + .../components/copyright-sign/copyright-sign.component.ts | 5 ++++- .../agenda/components/agenda-list/agenda-list.component.ts | 3 ++- .../motion-detail-diff/motion-detail-diff.component.ts | 3 ++- .../motions/components/motion-poll/motion-poll.component.ts | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/src/app/core/ui-services/choice.service.ts b/client/src/app/core/ui-services/choice.service.ts index fcff233de..88e1d4680 100644 --- a/client/src/app/core/ui-services/choice.service.ts +++ b/client/src/app/core/ui-services/choice.service.ts @@ -46,6 +46,7 @@ export class ChoiceService extends OpenSlidesComponent { const dialogRef = this.dialog.open(ChoiceDialogComponent, { minWidth: '250px', maxHeight: '90vh', + disableClose: true, data: { title: title, choices: choices, diff --git a/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts b/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts index 5f1e6270d..5b3a695d2 100644 --- a/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts +++ b/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts @@ -600,7 +600,10 @@ export class CopyrightSignComponent { if (this.clickCounter === 5) { this.clickCounter = 0; - this.dialog.open(C4DialogComponent, { width: '550px' }); + this.dialog.open(C4DialogComponent, { + width: '550px', + disableClose: true + }); } else { this.clickTimeout = setTimeout(() => { this.clickCounter = 0; diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts index d533dbb04..542b50bcd 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts @@ -118,7 +118,8 @@ export class AgendaListComponent extends ListViewBaseComponent impleme public openEditInfo(item: ViewItem): void { const dialogRef = this.dialog.open(ItemInfoDialogComponent, { width: '400px', - data: item + data: item, + disableClose: true }); dialogRef.afterClosed().subscribe(result => { diff --git a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts index 44742dc55..fa129fadb 100644 --- a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts +++ b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts @@ -319,7 +319,8 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte this.dialogService.open(MotionChangeRecommendationComponent, { height: '400px', width: '600px', - data: data + data: data, + disableClose: true }); } diff --git a/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts b/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts index 7fe19882b..24104f5d2 100644 --- a/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts +++ b/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts @@ -203,7 +203,8 @@ export class MotionPollComponent implements OnInit { const dialogRef = this.dialog.open(MotionPollDialogComponent, { data: { ...this.poll }, maxHeight: '90vh', - minWidth: '250px' + minWidth: '250px', + disableClose: true }); dialogRef.afterClosed().subscribe(result => { if (result) {