From 7a2b23a0363032e5bcbc38546ab62aca122635bb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Sep 2013 17:13:39 +0200
Subject: [PATCH] Fix double destroy on escape.

---
 core/js/jquery.ocdialog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index fb161440eb..f1836fd472 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -39,7 +39,8 @@
 					return;
 				}
 				// Escape
-				if(event.keyCode === 27 && self.options.closeOnEscape) {
+				if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
+					event.stopImmediatePropagation();
 					self.close();
 					return false;
 				}
-- 
GitLab