diff options
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/confirm/confirm.component.ts | 8 | ||||
-rw-r--r-- | client/src/app/shared/misc/constants.ts | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/client/src/app/shared/confirm/confirm.component.ts b/client/src/app/shared/confirm/confirm.component.ts index 53aed14d7..763454c4f 100644 --- a/client/src/app/shared/confirm/confirm.component.ts +++ b/client/src/app/shared/confirm/confirm.component.ts | |||
@@ -3,6 +3,7 @@ import { ConfirmService } from '@app/core/confirm/confirm.service' | |||
3 | import { I18n } from '@ngx-translate/i18n-polyfill' | 3 | import { I18n } from '@ngx-translate/i18n-polyfill' |
4 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' | 4 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' |
5 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' | 5 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' |
6 | import { POP_STATE_MODAL_DISMISS } from '@app/shared/misc/constants' | ||
6 | 7 | ||
7 | @Component({ | 8 | @Component({ |
8 | selector: 'my-confirm', | 9 | selector: 'my-confirm', |
@@ -63,6 +64,11 @@ export class ConfirmComponent implements OnInit { | |||
63 | 64 | ||
64 | this.openedModal.result | 65 | this.openedModal.result |
65 | .then(() => this.confirmService.confirmResponse.next(true)) | 66 | .then(() => this.confirmService.confirmResponse.next(true)) |
66 | .catch(() => this.confirmService.confirmResponse.next(false)) | 67 | .catch((reason: string) => { |
68 | // If the reason was that the user used the back button, we don't care about the confirm dialog result | ||
69 | if (!reason || reason !== POP_STATE_MODAL_DISMISS) { | ||
70 | this.confirmService.confirmResponse.next(false) | ||
71 | } | ||
72 | }) | ||
67 | } | 73 | } |
68 | } | 74 | } |
diff --git a/client/src/app/shared/misc/constants.ts b/client/src/app/shared/misc/constants.ts new file mode 100644 index 000000000..bb4a0884e --- /dev/null +++ b/client/src/app/shared/misc/constants.ts | |||
@@ -0,0 +1 @@ | |||
export const POP_STATE_MODAL_DISMISS = 'pop state dismiss' | |||