From 5dff9d88cb58c9c533a113d6cbde9d5b6acd1c92 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 2 Oct 2015 09:55:43 +0200 Subject: Make sure the conflict dialog is loaded before adding conflicts --- apps/files/js/file-upload.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 03330ad7c5d..8bae8567a05 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -201,8 +201,11 @@ OC.Upload = { return true; }); if (conflicts.length) { - _.each(conflicts, function(conflictData) { - OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].files[0], OC.Upload); + // wait for template loading + OC.dialogs.fileexists(null, null, null, OC.Upload).done(function() { + _.each(conflicts, function(conflictData) { + OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].files[0], OC.Upload); + }); }); } -- cgit v1.2.3