fix(enableescclose): default to true

aurelia · Dec 23, 2016 · 58bfc88 · 58bfc88
1 parent c0baaf5
commit 58bfc88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/dialog-renderer.js b/src/dialog-renderer.js
@@ -47,7 +47,7 @@ export class DialogRenderer {
   _escapeKeyEventHandler = (e) => {
     if (e.keyCode === 27) {
       let top = this._dialogControllers[this._dialogControllers.length - 1];
-      if (top && (top.settings.lock !== true && !top.settings.enableEscClose)) {
+      if (top && (top.settings.lock !== true && top.settings.enableEscClose)) {
         top.cancel();
       }
     }

diff --git a/test/unit/dialog-renderer.spec.js b/test/unit/dialog-renderer.spec.js
@@ -68,7 +68,7 @@ describe('the Dialog Renderer', () => {
   });
 
   it('does close the top dialog, when not locked, on ESC', function (done) {
-    const settings = { lock: false };
+    const settings = { lock: false, enableEscClose: true };
     const expectedEndCount = 1;
     const first = createDialogController(settings);
     const last = createDialogController(settings);
@@ -130,7 +130,7 @@ describe('the Dialog Renderer', () => {
       expect(last.renderer._dialogControllers.length).toBe(expectedEndCount);
       last.renderer._escapeKeyEventHandler({ keyCode: 27 });
       expect(first.cancel).not.toHaveBeenCalled();
-      expect(last.cancel).not.toHaveBeenCalled();
+      expect(last.cancel).toHaveBeenCalled();
       expect(last.renderer._dialogControllers.length).toBe(expectedEndCount);
       done();
     });