From 6cfeded64a85961364761b2a184649b6a5f2ddd8 Mon Sep 17 00:00:00 2001 From: Peter Rotich <peter@osticket.com> Date: Mon, 3 Mar 2014 19:34:23 +0000 Subject: [PATCH] Only intercept <ESC> if we have an overlay shown Stop propagation on intercept --- scp/js/scp.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scp/js/scp.js b/scp/js/scp.js index a9660d18f..a243d7cb4 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -376,11 +376,16 @@ $(document).ready(function(){ return false; }); - $(document).keydown(function(e) { - if (e.keyCode == 27) { + $(document).keydown(function(e) { + + if (e.keyCode == 27 && !$('#overlay').is(':hidden')) { $('div.dialog').hide(); $('#overlay').hide(); - } + + e.preventDefault(); + e.stopPropagation(); + return false; + } }); /* advanced search */ -- GitLab