From 9c07c6de31bec6159c142aba05f5da4f179adebc 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 2ab155cdf..33839e80c 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -400,11 +400,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