diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-08 17:31:12 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-08 17:31:12 +0200 |
| commit | bd1d5b69fbe6df0f8faf53e3edb5cd7c44e1577c (patch) | |
| tree | e5578cf30d8e1a255202ba286c184983a8806b23 /core/js/oc-dialogs.js | |
| parent | 03c90e968f6e84a30698b836c091e377d4702700 (diff) | |
| download | nextcloud-server-bd1d5b69fbe6df0f8faf53e3edb5cd7c44e1577c.tar.gz nextcloud-server-bd1d5b69fbe6df0f8faf53e3edb5cd7c44e1577c.zip | |
fix ESC for conflicts dialog
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 7c4483cefcf..dc293f949c1 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -366,7 +366,6 @@ var OCdialogs = { controller.onCancel(data); } $(dialog_id).ocdialog('close'); - $(dialog_id).ocdialog('destroy').remove(); } }, { @@ -378,7 +377,6 @@ var OCdialogs = { controller.onContinue($(dialog_id + ' .conflict:not(.template)')); } $(dialog_id).ocdialog('close'); - $(dialog_id).ocdialog('destroy').remove(); } }]; |