Fixed cancelling of uploads and wrong merge conflict resolution
This commit is contained in:
parent
8e27b725ba
commit
965a8ba2c6
|
@ -42,9 +42,9 @@ tbody tr { background-color:#fff; height:2.5em; }
|
||||||
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
|
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
|
||||||
tbody tr.selected { background-color:#eee; }
|
tbody tr.selected { background-color:#eee; }
|
||||||
tbody a { color:#000; }
|
tbody a { color:#000; }
|
||||||
span.extention, span.uploading, td.date { color:#999; }
|
span.extension, span.uploading, td.date { color:#999; }
|
||||||
span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
|
span.extension { text-transform:lowercase; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
|
||||||
tr:hover span.extention { opacity:1; }
|
tr:hover span.extension { opacity:1; }
|
||||||
div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
|
div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
|
||||||
div.crumb:first-child { padding-left:1em; }
|
div.crumb:first-child { padding-left:1em; }
|
||||||
div.crumb.last { font-weight:bold; }
|
div.crumb.last { font-weight:bold; }
|
||||||
|
|
|
@ -9,13 +9,20 @@ Files={
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
cancelUploads:function() {
|
cancelUploads:function() {
|
||||||
$.each(uploadingFiles,function(index,file){
|
$.each(uploadingFiles,function(index,file) {
|
||||||
|
if(typeof file['abort'] === 'function') {
|
||||||
file.abort();
|
file.abort();
|
||||||
delete uploadingFiles[index];
|
|
||||||
var filename = $('tr').filterAttr('data-file',index);
|
var filename = $('tr').filterAttr('data-file',index);
|
||||||
filename.hide();
|
filename.hide();
|
||||||
filename.find('input[type="checkbox"]').removeAttr('checked');
|
filename.find('input[type="checkbox"]').removeAttr('checked');
|
||||||
filename.removeClass('selected');
|
filename.removeClass('selected');
|
||||||
|
} else {
|
||||||
|
$.each(file,function(i,f) {
|
||||||
|
f.abort();
|
||||||
|
delete file[i];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
delete uploadingFiles[index];
|
||||||
});
|
});
|
||||||
procesSelection();
|
procesSelection();
|
||||||
}
|
}
|
||||||
|
@ -206,8 +213,9 @@ $(document).ready(function() {
|
||||||
}else{
|
}else{
|
||||||
if($.support.xhrFileUpload) {
|
if($.support.xhrFileUpload) {
|
||||||
for(var i=0;i<files.length;i++){
|
for(var i=0;i<files.length;i++){
|
||||||
|
var fileName = files[i].name
|
||||||
var dropTarget = $(e.originalEvent.target).closest('tr');
|
var dropTarget = $(e.originalEvent.target).closest('tr');
|
||||||
if(dropTarget && dropTarget.attr('data-type') === 'dir') {
|
if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
|
||||||
var dirName = dropTarget.attr('data-file')
|
var dirName = dropTarget.attr('data-file')
|
||||||
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i],
|
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i],
|
||||||
formData: function(form) {
|
formData: function(form) {
|
||||||
|
@ -222,7 +230,7 @@ $(document).ready(function() {
|
||||||
$('#notification').fadeIn();
|
$('#notification').fadeIn();
|
||||||
}
|
}
|
||||||
var file=response[0];
|
var file=response[0];
|
||||||
delete uploadingFiles[file.name];
|
delete uploadingFiles[dirName][file.name];
|
||||||
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
|
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
|
||||||
currentUploads -= 1;
|
currentUploads -= 1;
|
||||||
uploadtext.attr('currentUploads', currentUploads);
|
uploadtext.attr('currentUploads', currentUploads);
|
||||||
|
@ -238,12 +246,28 @@ $(document).ready(function() {
|
||||||
})
|
})
|
||||||
.error(function(jqXHR, textStatus, errorThrown) {
|
.error(function(jqXHR, textStatus, errorThrown) {
|
||||||
if(errorThrown === 'abort') {
|
if(errorThrown === 'abort') {
|
||||||
|
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
|
||||||
|
currentUploads -= 1;
|
||||||
|
uploadtext.attr('currentUploads', currentUploads);
|
||||||
|
if(currentUploads === 0) {
|
||||||
|
var img = OC.imagePath('core', 'filetypes/folder.png');
|
||||||
|
var tr=$('tr').filterAttr('data-file',dirName);
|
||||||
|
tr.find('td.filename').attr('style','background-image:url('+img+')');
|
||||||
|
uploadtext.text('');
|
||||||
|
uploadtext.hide();
|
||||||
|
} else {
|
||||||
|
uploadtext.text(currentUploads + ' files uploading')
|
||||||
|
}
|
||||||
$('#notification').hide();
|
$('#notification').hide();
|
||||||
$('#notification').text(t('files', 'Upload cancelled.'));
|
$('#notification').text(t('files', 'Upload cancelled.'));
|
||||||
$('#notification').fadeIn();
|
$('#notification').fadeIn();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
uploadingFiles[dirName+"/"+files[i].name] = jqXHR;
|
//TODO test with filenames containing slashes
|
||||||
|
if(uploadingFiles[dirName] === undefined) {
|
||||||
|
uploadingFiles[dirName] = {};
|
||||||
|
}
|
||||||
|
uploadingFiles[dirName][fileName] = jqXHR;
|
||||||
} else {
|
} else {
|
||||||
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i]})
|
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i]})
|
||||||
.success(function(result, textStatus, jqXHR) {
|
.success(function(result, textStatus, jqXHR) {
|
||||||
|
|
Loading…
Reference in New Issue