feat(module:modal): support disable the esc key to close (#567)

NG-ZORRO · Nov 16, 2017 · 75bc6b6 · 75bc6b6
1 parent b4824d9
commit 75bc6b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/modal/nz-confirm.component.ts b/src/components/modal/nz-confirm.component.ts
@@ -192,7 +192,9 @@ export class NzConfirmComponent implements OnInit, OnDestroy {
 
   @HostListener('keydown.esc', [ '$event' ])
   onEsc(e): void {
-    this.subject.next('onCancel');
+    if (this._maskClosable) {
+      this.subject.next('onCancel');
+    }
   }
 
   @HostListener('keydown.enter', [ '$event' ])

diff --git a/src/components/modal/nz-modal.component.ts b/src/components/modal/nz-modal.component.ts
@@ -241,7 +241,9 @@ export class NzModalComponent implements OnInit, OnDestroy, AfterViewInit {
 
   @HostListener('keydown.esc', [ '$event' ])
   onEsc(e): void {
-    this.clickCancel(e);
+    if (this._maskClosable) {
+      this.clickCancel(e);
+    }
   }
 
   setStyles(origin?): void {