diff options
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index fd77f5998b5..bc460798350 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -262,10 +262,10 @@ var OCdialogs = { //TODO show skip action for files with same size and mtime in bottom row }; - var selection = controller.getSelection(data.originalFiles); - if (selection.defaultAction) { - controller[selection.defaultAction](data); - } else { + //var selection = controller.getSelection(data.originalFiles); + //if (selection.defaultAction) { + // controller[selection.defaultAction](data); + //} else { var dialog_name = 'oc-dialog-fileexists-content'; var dialog_id = '#' + dialog_name; if (this._fileexistsshown) { @@ -306,6 +306,7 @@ var OCdialogs = { if ( typeof controller.onCancel !== 'undefined') { controller.onCancel(data); } + $(dialog_id).ocdialog('close'); $(dialog_id).ocdialog('destroy').remove(); } }, @@ -382,7 +383,7 @@ var OCdialogs = { alert(t('core', 'Error loading file exists template')); }); } - } + //} }, _getFilePickerTemplate: function() { var defer = $.Deferred(); |