wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ESC for conflicts dialog

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2013-09-08 17:31:12 +02:00
parent 03c90e968f
commit bd1d5b69fb
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/oc-dialogs.js
View file

@ -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();
}
}];