diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts index 57d3a30a01..4a4795074d 100644 --- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts +++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts @@ -117,6 +117,23 @@ import { EventMock } from './assets/event.mock'; }); })); + it('Esc button should not hide the viewer if is not overlay mode', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { + return tcb + .createAsync(ViewerComponent) + .then((fixture) => { + let element = fixture.nativeElement; + let component = fixture.componentInstance; + component.overlayMode = false; + + component.urlFile = 'fake-url-file'; + + fixture.detectChanges(); + EventMock.keyDown(27); + fixture.detectChanges(); + expect(element.querySelector('#viewer-main-container')).not.toBeNull(); + }); + })); + it('Esc button should hide the viewer', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb .createAsync(ViewerComponent) @@ -124,6 +141,7 @@ import { EventMock } from './assets/event.mock'; let element = fixture.nativeElement; let component = fixture.componentInstance; component.urlFile = 'fake-url-file'; + component.overlayMode = true; fixture.detectChanges(); EventMock.keyDown(27); diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts index d5591d0be3..62e0a9cea4 100644 --- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts @@ -166,7 +166,7 @@ export class ViewerComponent { @HostListener('document:keydown', ['$event']) handleKeyboardEvent(event: KeyboardEvent) { let key = event.keyCode; - if (key === 27) { // esc + if (key === 27 && this.overlayMode) { // esc this.close(); } }