ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent dialogs to close easily (Fixes #4116)

Browse Source 
dialogs (created by MatDialog) should only close if the user explicit clicks 'x' or 'cancel' now
This commit is contained in:
GabrielMeyer 2019-02-06 14:41:55 +01:00 committed by Emanuel Schütze
parent eab6e9bfd0
commit 2ef35d0b50
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/core/ui-services/choice.service.ts
View File

@ -46,6 +46,7 @@ export class ChoiceService extends OpenSlidesComponent {
const dialogRef = this.dialog.open(ChoiceDialogComponent, { const dialogRef = this.dialog.open(ChoiceDialogComponent, {
minWidth: '250px', minWidth: '250px',
maxHeight: '90vh', maxHeight: '90vh',
disableClose: true,
data: { data: {
title: title, title: title,
choices: choices, choices: choices,

5
client/src/app/shared/components/copyright-sign/copyright-sign.component.ts
View File

@ -600,7 +600,10 @@ export class CopyrightSignComponent {
if (this.clickCounter === 5) { if (this.clickCounter === 5) {
this.clickCounter = 0; this.clickCounter = 0;
this.dialog.open(C4DialogComponent, { width: '550px' }); this.dialog.open(C4DialogComponent, {
width: '550px',
disableClose: true
});
} else { } else {
this.clickTimeout = <any>setTimeout(() => { this.clickTimeout = <any>setTimeout(() => {
this.clickCounter = 0; this.clickCounter = 0;

3
client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
View File

@ -118,7 +118,8 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem> impleme
public openEditInfo(item: ViewItem): void { public openEditInfo(item: ViewItem): void {
const dialogRef = this.dialog.open(ItemInfoDialogComponent, { const dialogRef = this.dialog.open(ItemInfoDialogComponent, {
width: '400px', width: '400px',
data: item data: item,
disableClose: true
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {

3
client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
View File

@ -319,7 +319,8 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
this.dialogService.open(MotionChangeRecommendationComponent, { this.dialogService.open(MotionChangeRecommendationComponent, {
height: '400px', height: '400px',
width: '600px', width: '600px',
data: data data: data,
disableClose: true
}); });
} }

3
client/src/app/site/motions/components/motion-poll/motion-poll.component.ts
View File

@ -203,7 +203,8 @@ export class MotionPollComponent implements OnInit {
const dialogRef = this.dialog.open(MotionPollDialogComponent, { const dialogRef = this.dialog.open(MotionPollDialogComponent, {
data: { ...this.poll }, data: { ...this.poll },
maxHeight: '90vh', maxHeight: '90vh',
minWidth: '250px' minWidth: '250px',
disableClose: true
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
if (result) { if (result) {