From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 11 Sep 2013 15:13:39 +0000 (+0200)
Subject: Fix double destroy on escape.
X-Git-Tag: v6.0.0alpha2~188^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7a2b23a0363032e5bcbc38546ab62aca122635bb;p=nextcloud-server.git

Fix double destroy on escape.
---

diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index fb161440ebb..f1836fd4727 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;
 				}