summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-09-11 17:13:39 +0200
committerThomas Tanghus <thomas@tanghus.net>2013-09-11 17:13:39 +0200
commit7a2b23a0363032e5bcbc38546ab62aca122635bb (patch)
tree5493d1ab4d8917cea4646a3f3edcb5cf34d260b0 /core
parentfdfdd2e4e78ca025290b9525288c7546f62653f0 (diff)
downloadnextcloud-server-7a2b23a0363032e5bcbc38546ab62aca122635bb.tar.gz
nextcloud-server-7a2b23a0363032e5bcbc38546ab62aca122635bb.zip
Fix double destroy on escape.
Diffstat (limited to 'core')
-rw-r--r--core/js/jquery.ocdialog.js3
1 files changed, 2 insertions, 1 deletions
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;
}