From 8a7e26b268b8f4be32bb0b54527a83cadbfc28fd Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Thu, 5 Sep 2013 17:46:19 +0200 Subject: cleanup dead code --- core/js/oc-dialogs.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/js/oc-dialogs.js') 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'); } -- cgit v1.2.3