diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 17:46:19 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 17:46:19 +0200 |
| commit | 8a7e26b268b8f4be32bb0b54527a83cadbfc28fd (patch) | |
| tree | c60cbfc70c1aa8209145a40c8debad44c5673e1b /core/js/oc-dialogs.js | |
| parent | 03ddf8da8023b1f77559ac460c43df8d15e7afe5 (diff) | |
| download | nextcloud-server-8a7e26b268b8f4be32bb0b54527a83cadbfc28fd.tar.gz nextcloud-server-8a7e26b268b8f4be32bb0b54527a83cadbfc28fd.zip | |
cleanup dead code
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 08afbfd42f2..77af1a2dde5 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -224,6 +224,8 @@ var OCdialogs = { var conflict = conflicts.find('.conflict.template').clone(); + conflict.data('data',data); + conflict.find('.filename').text(original.name); conflict.find('.original .size').text(humanFileSize(original.size)); conflict.find('.original .mtime').text(formatDate(original.mtime*1000)); @@ -312,9 +314,8 @@ var OCdialogs = { classes: 'continue', click: function(){ self._fileexistsshown = false; - if ( typeof controller.onRename !== 'undefined') { - //TODO use autorename when repeat is checked - controller.onRename(data, $(dialog_id + ' #newname').val()); + if ( typeof controller.onContinue !== 'undefined') { + controller.onContinue($(dialog_id + ' .conflict:not(.template)')); } $(dialog_id).ocdialog('close'); } |