summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-06-03 03:19:35 +0200
committerThomas Tanghus <thomas@tanghus.net>2013-06-03 03:19:35 +0200
commit5f1cbc6a1ad9d7bb67b1c64418f5d5ac0ab8695d (patch)
treee38a8b41972f32c906eed4c53904765853d409fc /core
parentafd723fdcd780f67735505ac132e988b2af547e3 (diff)
downloadnextcloud-server-5f1cbc6a1ad9d7bb67b1c64418f5d5ac0ab8695d.tar.gz
nextcloud-server-5f1cbc6a1ad9d7bb67b1c64418f5d5ac0ab8695d.zip
Catch double destroy on escape.
Diffstat (limited to 'core')
-rw-r--r--core/js/oc-dialogs.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index a6a9e7e57e2..456cc34ed4e 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -129,7 +129,9 @@ var OCdialogs = {
modal: modal,
buttons: buttonlist,
close: function(event, ui) {
- self.$filePicker.ocdialog('destroy').remove();
+ try {
+ $(this).ocdialog('destroy').remove();
+ } catch(e) {}
self.$filePicker = null;
}
});