mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise 

Make sure the conflict dialog is loaded before adding conflicts
This commit is contained in:
Thomas Müller 2015-10-02 12:15:44 +02:00
parent d0f6bfe7b6 5dff9d88cb
commit 3564a837d8
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files/js/file-upload.js
View File

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

15
core/js/oc-dialogs.js
View File

@ -312,9 +312,11 @@ var OCdialogs = {
* @param {object} original file with name, size and mtime
* @param {object} replacement file with name, size and mtime
* @param {object} controller with onCancel, onSkip, onReplace and onRename methods
* @return {Promise} jquery promise that resolves after the dialog template was loaded
*/
fileexists:function(data, original, replacement, controller) {
var self = this;
var dialogDeferred = new $.Deferred();
var getCroppedPreview = function(file) {
var deferred = new $.Deferred();
@ -540,7 +542,7 @@ var OCdialogs = {
//recalculate dimensions
$(window).trigger('resize');
dialogDeferred.resolve();
} else {
//create dialog
this._fileexistsshown = true;
@ -559,8 +561,10 @@ var OCdialogs = {
});
$('body').append($dlg);
var $conflicts = $dlg.find('.conflicts');
addConflict($conflicts, original, replacement);
if (original && replacement) {
var $conflicts = $dlg.find('.conflicts');
addConflict($conflicts, original, replacement);
}
var buttonlist = [{
text: t('core', 'Cancel'),
@ -612,7 +616,7 @@ var OCdialogs = {
});
$(dialogId).find('.conflicts').on('click', '.replacement input[type="checkbox"],.original:not(.readonly) input[type="checkbox"]', function() {
var $checkbox = $(this);
$checkbox.prop('checked', !checkbox.prop('checked'));
$checkbox.prop('checked', !$checkbox.prop('checked'));
});
//update counters
@ -643,12 +647,15 @@ var OCdialogs = {
$(dialogId).find('.allexistingfiles + .count').text('');
}
});
dialogDeferred.resolve();
})
.fail(function() {
dialogDeferred.reject();
alert(t('core', 'Error loading file exists template'));
});
}
//}
return dialogDeferred.promise();
},
_getFilePickerTemplate: function() {
var defer = $.Deferred();