fix ESC for conflicts dialog

11 years ago · bd1d5b69fb
parent 03c90e968f
commit bd1d5b69fb
1 changed files with 0 additions and 2 deletions
--- 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();
 							}
 						}];