resolve merge conflicts
This commit is contained in:
commit
de135e3b9b
|
@ -30,6 +30,8 @@
|
||||||
.file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
|
.file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
|
||||||
.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
|
.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
|
||||||
|
|
||||||
|
#upload { position:absolute; right:13.5em; top:0em; }
|
||||||
|
#upload #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
|
||||||
|
|
||||||
.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
|
.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
|
||||||
|
|
||||||
|
@ -41,7 +43,7 @@ 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.extension, td.date { color:#999; }
|
span.extension, span.uploading, td.date { color:#999; }
|
||||||
span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
|
span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
|
||||||
tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
|
tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
|
||||||
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; }
|
||||||
|
@ -60,8 +62,10 @@ table td.filename a.name { display:block; height:1.5em; vertical-align:middle; m
|
||||||
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
|
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
|
||||||
table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; }
|
table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; }
|
||||||
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
|
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
|
||||||
table td.filename .nametext, .modified { float:left; padding:.3em 0; }
|
table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
|
||||||
table td.filename .nametext { width:70%; overflow:hidden; }
|
// TODO fix usability bug (accidental file/folder selection)
|
||||||
|
//table td.filename .nametext { width:60%; }
|
||||||
|
table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
|
||||||
table td.filename form { float:left; font-size:.85em; }
|
table td.filename form { float:left; font-size:.85em; }
|
||||||
table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
|
table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
|
||||||
table thead.fixed { height:2em; }
|
table thead.fixed { height:2em; }
|
||||||
|
|
|
@ -30,6 +30,8 @@ OC_Util::checkLoggedIn();
|
||||||
|
|
||||||
// Load the files we need
|
// Load the files we need
|
||||||
OC_Util::addStyle( "files", "files" );
|
OC_Util::addStyle( "files", "files" );
|
||||||
|
OC_Util::addScript( "files", "jquery.iframe-transport" );
|
||||||
|
OC_Util::addScript( "files", "jquery.fileupload" );
|
||||||
OC_Util::addScript( "files", "files" );
|
OC_Util::addScript( "files", "files" );
|
||||||
OC_Util::addScript( 'files', 'filelist' );
|
OC_Util::addScript( 'files', 'filelist' );
|
||||||
OC_Util::addScript( 'files', 'fileactions' );
|
OC_Util::addScript( 'files', 'fileactions' );
|
||||||
|
|
|
@ -140,7 +140,20 @@ $(document).ready(function(){
|
||||||
});
|
});
|
||||||
|
|
||||||
FileActions.register('all','Delete',function(){return OC.imagePath('core','actions/delete')},function(filename){
|
FileActions.register('all','Delete',function(){return OC.imagePath('core','actions/delete')},function(filename){
|
||||||
FileList.do_delete(filename);
|
if(Files.cancelUpload(filename)) {
|
||||||
|
if(filename.substr){
|
||||||
|
filename=[filename];
|
||||||
|
}
|
||||||
|
$.each(filename,function(index,file){
|
||||||
|
var filename = $('tr').filterAttr('data-file',file);
|
||||||
|
filename.hide();
|
||||||
|
filename.find('input[type="checkbox"]').removeAttr('checked');
|
||||||
|
filename.removeClass('selected');
|
||||||
|
});
|
||||||
|
procesSelection();
|
||||||
|
}else{
|
||||||
|
FileList.do_delete(filename);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){
|
FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){
|
||||||
|
|
|
@ -43,6 +43,7 @@ FileList={
|
||||||
td.append('<input type="checkbox" />');
|
td.append('<input type="checkbox" />');
|
||||||
var link_elem = $('<a></a>').attr({ "class": "name", "href": "index.php?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
|
var link_elem = $('<a></a>').attr({ "class": "name", "href": "index.php?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
|
||||||
link_elem.append($('<span></span>').addClass('nametext').text(name));
|
link_elem.append($('<span></span>').addClass('nametext').text(name));
|
||||||
|
link_elem.append($('<span></span>').attr({'class': 'uploadtext', 'currentUploads': 0}));
|
||||||
td.append(link_elem);
|
td.append(link_elem);
|
||||||
html.append(td);
|
html.append(td);
|
||||||
if(size!='Pending'){
|
if(size!='Pending'){
|
||||||
|
|
|
@ -1,3 +1,32 @@
|
||||||
|
var uploadingFiles = {};
|
||||||
|
Files={
|
||||||
|
cancelUpload:function(filename) {
|
||||||
|
if(uploadingFiles[filename]) {
|
||||||
|
uploadingFiles[filename].abort();
|
||||||
|
delete uploadingFiles[filename];
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
cancelUploads:function() {
|
||||||
|
$.each(uploadingFiles,function(index,file) {
|
||||||
|
if(typeof file['abort'] === 'function') {
|
||||||
|
file.abort();
|
||||||
|
var filename = $('tr').filterAttr('data-file',index);
|
||||||
|
filename.hide();
|
||||||
|
filename.find('input[type="checkbox"]').removeAttr('checked');
|
||||||
|
filename.removeClass('selected');
|
||||||
|
} else {
|
||||||
|
$.each(file,function(i,f) {
|
||||||
|
f.abort();
|
||||||
|
delete file[i];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
delete uploadingFiles[index];
|
||||||
|
});
|
||||||
|
procesSelection();
|
||||||
|
}
|
||||||
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$('#fileList tr').each(function(){
|
$('#fileList tr').each(function(){
|
||||||
//little hack to set unescape filenames in attribute
|
//little hack to set unescape filenames in attribute
|
||||||
|
@ -151,83 +180,205 @@ $(document).ready(function() {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.file_upload_start').live('change',function(){
|
// drag&drop support using jquery.fileupload
|
||||||
var form=$(this).closest('form');
|
// TODO use OC.dialogs
|
||||||
var that=this;
|
$(document).bind('drop dragover', function (e) {
|
||||||
var uploadId=form.attr('data-upload-id');
|
e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
|
||||||
var files=this.files;
|
});
|
||||||
var target=form.children('iframe');
|
|
||||||
var totalSize=0;
|
$(function() {
|
||||||
if(files){
|
$('.file_upload_start').fileupload({
|
||||||
for(var i=0;i<files.length;i++){
|
dropZone: $('#content'), // restrict dropZone to content div
|
||||||
totalSize+=files[i].size;
|
add: function(e, data) {
|
||||||
if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
|
var files = data.files;
|
||||||
FileList.finishDelete(function(){
|
var totalSize=0;
|
||||||
$(that).change();
|
if(files){
|
||||||
});
|
for(var i=0;i<files.length;i++){
|
||||||
return;
|
totalSize+=files[i].size;
|
||||||
}
|
if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
|
||||||
}
|
FileList.finishDelete(function(){
|
||||||
}
|
$('.file_upload_start').change();
|
||||||
if(totalSize>$('#max_upload').val()){
|
});
|
||||||
$( "#uploadsize-message" ).dialog({
|
return;
|
||||||
modal: true,
|
}
|
||||||
buttons: {
|
|
||||||
Close: function() {
|
|
||||||
$( this ).dialog( "close" );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
if(totalSize>$('#max_upload').val()){
|
||||||
}else{
|
$( '#uploadsize-message' ).dialog({
|
||||||
target.load(function(){
|
modal: true,
|
||||||
var response=jQuery.parseJSON(target.contents().find('body').text());
|
buttons: {
|
||||||
//set mimetype and if needed filesize
|
Close: function() {
|
||||||
if(response){
|
$( this ).dialog( 'close' );
|
||||||
if(response[0] != undefined && response[0].status == 'success'){
|
}
|
||||||
for(var i=0;i<response.length;i++){
|
}
|
||||||
var file=response[i];
|
});
|
||||||
|
}else{
|
||||||
|
if($.support.xhrFileUpload) {
|
||||||
|
for(var i=0;i<files.length;i++){
|
||||||
|
var fileName = files[i].name
|
||||||
|
var dropTarget = $(e.originalEvent.target).closest('tr');
|
||||||
|
if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
|
||||||
|
var dirName = dropTarget.attr('data-file')
|
||||||
|
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i],
|
||||||
|
formData: function(form) {
|
||||||
|
var formArray = form.serializeArray();
|
||||||
|
formArray[1]['value'] = dirName;
|
||||||
|
return formArray;
|
||||||
|
}}).success(function(result, textStatus, jqXHR) {
|
||||||
|
var response;
|
||||||
|
response=jQuery.parseJSON(result);
|
||||||
|
if(response[0] == undefined || response[0].status != 'success') {
|
||||||
|
$('#notification').text(t('files', response.data.message));
|
||||||
|
$('#notification').fadeIn();
|
||||||
|
}
|
||||||
|
var file=response[0];
|
||||||
|
delete uploadingFiles[dirName][file.name];
|
||||||
|
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')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.error(function(jqXHR, textStatus, errorThrown) {
|
||||||
|
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').text(t('files', 'Upload cancelled.'));
|
||||||
|
$('#notification').fadeIn();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
//TODO test with filenames containing slashes
|
||||||
|
if(uploadingFiles[dirName] === undefined) {
|
||||||
|
uploadingFiles[dirName] = {};
|
||||||
|
}
|
||||||
|
uploadingFiles[dirName][fileName] = jqXHR;
|
||||||
|
} else {
|
||||||
|
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i]})
|
||||||
|
.success(function(result, textStatus, jqXHR) {
|
||||||
|
var response;
|
||||||
|
response=jQuery.parseJSON(result);
|
||||||
|
if(response[0] != undefined && response[0].status == 'success') {
|
||||||
|
var file=response[0];
|
||||||
|
delete uploadingFiles[file.name];
|
||||||
|
$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
|
||||||
|
var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
|
||||||
|
if(size==t('files','Pending')){
|
||||||
|
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
||||||
|
}
|
||||||
|
FileList.loadingDone(file.name);
|
||||||
|
} else {
|
||||||
|
$('#notification').text(t('files', response.data.message));
|
||||||
|
$('#notification').fadeIn();
|
||||||
|
$('#fileList > tr').not('[data-mime]').fadeOut();
|
||||||
|
$('#fileList > tr').not('[data-mime]').remove();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.error(function(jqXHR, textStatus, errorThrown) {
|
||||||
|
if(errorThrown === 'abort') {
|
||||||
|
$('#notification').hide();
|
||||||
|
$('#notification').text(t('files', 'Upload cancelled.'));
|
||||||
|
$('#notification').fadeIn();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
uploadingFiles[files[i].name] = jqXHR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
data.submit().success(function(data, status) {
|
||||||
|
response = jQuery.parseJSON(data[0].body.innerText);
|
||||||
|
if(response[0] != undefined && response[0].status == 'success') {
|
||||||
|
var file=response[0];
|
||||||
|
delete uploadingFiles[file.name];
|
||||||
$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
|
$('tr').filterAttr('data-file',file.name).data('mime',file.mime);
|
||||||
if(size=='Pending'){
|
var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text();
|
||||||
|
if(size==t('files','Pending')){
|
||||||
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
||||||
}
|
}
|
||||||
FileList.loadingDone(file.name);
|
FileList.loadingDone(file.name);
|
||||||
|
} else {
|
||||||
|
$('#notification').text(t('files', response.data.message));
|
||||||
|
$('#notification').fadeIn();
|
||||||
|
$('#fileList > tr').not('[data-mime]').fadeOut();
|
||||||
|
$('#fileList > tr').not('[data-mime]').remove();
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
else{
|
|
||||||
$('#notification').text(t('files',response.data.message));
|
|
||||||
$('#notification').fadeIn();
|
|
||||||
$('#fileList > tr').not('[data-mime]').fadeOut();
|
|
||||||
$('#fileList > tr').not('[data-mime]').remove();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
form.submit();
|
|
||||||
var date=new Date();
|
|
||||||
if(files){
|
|
||||||
for(var i=0;i<files.length;i++){
|
|
||||||
if(files[i].size>0){
|
|
||||||
var size=files[i].size;
|
|
||||||
}else{
|
|
||||||
var size=t('files','Pending');
|
|
||||||
}
|
|
||||||
if(files){
|
|
||||||
FileList.addFile(getUniqueName(files[i].name),size,date,true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
|
|
||||||
FileList.addFile(getUniqueName(filename),'Pending',date,true);
|
|
||||||
}
|
|
||||||
|
|
||||||
//clone the upload form and hide the new one to allow users to start a new upload while the old one is still uploading
|
var date=new Date();
|
||||||
var clone=form.clone();
|
if(files){
|
||||||
uploadId++;
|
for(var i=0;i<files.length;i++){
|
||||||
clone.attr('data-upload-id',uploadId);
|
if(files[i].size>0){
|
||||||
clone.attr('target','file_upload_target_'+uploadId);
|
var size=files[i].size;
|
||||||
clone.children('iframe').attr('name','file_upload_target_'+uploadId)
|
}else{
|
||||||
clone.insertBefore(form);
|
var size=t('files','Pending');
|
||||||
form.hide();
|
}
|
||||||
}
|
if(files && !dirName){
|
||||||
|
FileList.addFile(getUniqueName(files[i].name),size,date,true);
|
||||||
|
} else if(dirName) {
|
||||||
|
var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
|
||||||
|
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
|
||||||
|
currentUploads += 1;
|
||||||
|
uploadtext.attr('currentUploads', currentUploads);
|
||||||
|
if(currentUploads === 1) {
|
||||||
|
var img = OC.imagePath('core', 'loading.gif');
|
||||||
|
var tr=$('tr').filterAttr('data-file',dirName);
|
||||||
|
tr.find('td.filename').attr('style','background-image:url('+img+')');
|
||||||
|
uploadtext.text('1 file uploading');
|
||||||
|
uploadtext.show();
|
||||||
|
} else {
|
||||||
|
uploadtext.text(currentUploads + ' files uploading')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
|
||||||
|
FileList.addFile(getUniqueName(filename),'Pending',date,true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
fail: function(e, data) {
|
||||||
|
// TODO: cancel upload & display error notification
|
||||||
|
},
|
||||||
|
progress: function(e, data) {
|
||||||
|
// TODO: show nice progress bar in file row
|
||||||
|
},
|
||||||
|
progressall: function(e, data) {
|
||||||
|
var progress = (data.loaded/data.total)*100;
|
||||||
|
$('#uploadprogressbar').progressbar('value',progress);
|
||||||
|
},
|
||||||
|
start: function(e, data) {
|
||||||
|
$('#uploadprogressbar').progressbar({value:0});
|
||||||
|
$('#uploadprogressbar').fadeIn();
|
||||||
|
if(data.dataType != 'iframe ') {
|
||||||
|
$('#upload input.stop').show();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
stop: function(e, data) {
|
||||||
|
if(data.dataType != 'iframe ') {
|
||||||
|
$('#upload input.stop').hide();
|
||||||
|
}
|
||||||
|
$('#uploadprogressbar').progressbar('value',100);
|
||||||
|
$('#uploadprogressbar').fadeOut();
|
||||||
|
}
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
|
//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
|
||||||
|
|
|
@ -0,0 +1,866 @@
|
||||||
|
/*
|
||||||
|
* jQuery File Upload Plugin 5.9
|
||||||
|
* https://github.com/blueimp/jQuery-File-Upload
|
||||||
|
*
|
||||||
|
* Copyright 2010, Sebastian Tschan
|
||||||
|
* https://blueimp.net
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license:
|
||||||
|
* http://www.opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*jslint nomen: true, unparam: true, regexp: true */
|
||||||
|
/*global define, window, document, Blob, FormData, location */
|
||||||
|
|
||||||
|
(function (factory) {
|
||||||
|
'use strict';
|
||||||
|
if (typeof define === 'function' && define.amd) {
|
||||||
|
// Register as an anonymous AMD module:
|
||||||
|
define([
|
||||||
|
'jquery',
|
||||||
|
'jquery.ui.widget'
|
||||||
|
], factory);
|
||||||
|
} else {
|
||||||
|
// Browser globals:
|
||||||
|
factory(window.jQuery);
|
||||||
|
}
|
||||||
|
}(function ($) {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
// The FileReader API is not actually used, but works as feature detection,
|
||||||
|
// as e.g. Safari supports XHR file uploads via the FormData API,
|
||||||
|
// but not non-multipart XHR file uploads:
|
||||||
|
$.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
|
||||||
|
$.support.xhrFormDataFileUpload = !!window.FormData;
|
||||||
|
|
||||||
|
// The fileupload widget listens for change events on file input fields defined
|
||||||
|
// via fileInput setting and paste or drop events of the given dropZone.
|
||||||
|
// In addition to the default jQuery Widget methods, the fileupload widget
|
||||||
|
// exposes the "add" and "send" methods, to add or directly send files using
|
||||||
|
// the fileupload API.
|
||||||
|
// By default, files added via file input selection, paste, drag & drop or
|
||||||
|
// "add" method are uploaded immediately, but it is possible to override
|
||||||
|
// the "add" callback option to queue file uploads.
|
||||||
|
$.widget('blueimp.fileupload', {
|
||||||
|
|
||||||
|
options: {
|
||||||
|
// The namespace used for event handler binding on the dropZone and
|
||||||
|
// fileInput collections.
|
||||||
|
// If not set, the name of the widget ("fileupload") is used.
|
||||||
|
namespace: undefined,
|
||||||
|
// The drop target collection, by the default the complete document.
|
||||||
|
// Set to null or an empty collection to disable drag & drop support:
|
||||||
|
dropZone: $(document),
|
||||||
|
// The file input field collection, that is listened for change events.
|
||||||
|
// If undefined, it is set to the file input fields inside
|
||||||
|
// of the widget element on plugin initialization.
|
||||||
|
// Set to null or an empty collection to disable the change listener.
|
||||||
|
fileInput: undefined,
|
||||||
|
// By default, the file input field is replaced with a clone after
|
||||||
|
// each input field change event. This is required for iframe transport
|
||||||
|
// queues and allows change events to be fired for the same file
|
||||||
|
// selection, but can be disabled by setting the following option to false:
|
||||||
|
replaceFileInput: true,
|
||||||
|
// The parameter name for the file form data (the request argument name).
|
||||||
|
// If undefined or empty, the name property of the file input field is
|
||||||
|
// used, or "files[]" if the file input name property is also empty:
|
||||||
|
paramName: undefined,
|
||||||
|
// By default, each file of a selection is uploaded using an individual
|
||||||
|
// request for XHR type uploads. Set to false to upload file
|
||||||
|
// selections in one request each:
|
||||||
|
singleFileUploads: true,
|
||||||
|
// To limit the number of files uploaded with one XHR request,
|
||||||
|
// set the following option to an integer greater than 0:
|
||||||
|
limitMultiFileUploads: undefined,
|
||||||
|
// Set the following option to true to issue all file upload requests
|
||||||
|
// in a sequential order:
|
||||||
|
sequentialUploads: false,
|
||||||
|
// To limit the number of concurrent uploads,
|
||||||
|
// set the following option to an integer greater than 0:
|
||||||
|
limitConcurrentUploads: undefined,
|
||||||
|
// Set the following option to true to force iframe transport uploads:
|
||||||
|
forceIframeTransport: false,
|
||||||
|
// Set the following option to the location of a redirect url on the
|
||||||
|
// origin server, for cross-domain iframe transport uploads:
|
||||||
|
redirect: undefined,
|
||||||
|
// The parameter name for the redirect url, sent as part of the form
|
||||||
|
// data and set to 'redirect' if this option is empty:
|
||||||
|
redirectParamName: undefined,
|
||||||
|
// Set the following option to the location of a postMessage window,
|
||||||
|
// to enable postMessage transport uploads:
|
||||||
|
postMessage: undefined,
|
||||||
|
// By default, XHR file uploads are sent as multipart/form-data.
|
||||||
|
// The iframe transport is always using multipart/form-data.
|
||||||
|
// Set to false to enable non-multipart XHR uploads:
|
||||||
|
multipart: true,
|
||||||
|
// To upload large files in smaller chunks, set the following option
|
||||||
|
// to a preferred maximum chunk size. If set to 0, null or undefined,
|
||||||
|
// or the browser does not support the required Blob API, files will
|
||||||
|
// be uploaded as a whole.
|
||||||
|
maxChunkSize: undefined,
|
||||||
|
// When a non-multipart upload or a chunked multipart upload has been
|
||||||
|
// aborted, this option can be used to resume the upload by setting
|
||||||
|
// it to the size of the already uploaded bytes. This option is most
|
||||||
|
// useful when modifying the options object inside of the "add" or
|
||||||
|
// "send" callbacks, as the options are cloned for each file upload.
|
||||||
|
uploadedBytes: undefined,
|
||||||
|
// By default, failed (abort or error) file uploads are removed from the
|
||||||
|
// global progress calculation. Set the following option to false to
|
||||||
|
// prevent recalculating the global progress data:
|
||||||
|
recalculateProgress: true,
|
||||||
|
|
||||||
|
// Additional form data to be sent along with the file uploads can be set
|
||||||
|
// using this option, which accepts an array of objects with name and
|
||||||
|
// value properties, a function returning such an array, a FormData
|
||||||
|
// object (for XHR file uploads), or a simple object.
|
||||||
|
// The form of the first fileInput is given as parameter to the function:
|
||||||
|
formData: function (form) {
|
||||||
|
return form.serializeArray();
|
||||||
|
},
|
||||||
|
|
||||||
|
// The add callback is invoked as soon as files are added to the fileupload
|
||||||
|
// widget (via file input selection, drag & drop, paste or add API call).
|
||||||
|
// If the singleFileUploads option is enabled, this callback will be
|
||||||
|
// called once for each file in the selection for XHR file uplaods, else
|
||||||
|
// once for each file selection.
|
||||||
|
// The upload starts when the submit method is invoked on the data parameter.
|
||||||
|
// The data object contains a files property holding the added files
|
||||||
|
// and allows to override plugin options as well as define ajax settings.
|
||||||
|
// Listeners for this callback can also be bound the following way:
|
||||||
|
// .bind('fileuploadadd', func);
|
||||||
|
// data.submit() returns a Promise object and allows to attach additional
|
||||||
|
// handlers using jQuery's Deferred callbacks:
|
||||||
|
// data.submit().done(func).fail(func).always(func);
|
||||||
|
add: function (e, data) {
|
||||||
|
data.submit();
|
||||||
|
},
|
||||||
|
|
||||||
|
// Other callbacks:
|
||||||
|
// Callback for the submit event of each file upload:
|
||||||
|
// submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
|
||||||
|
// Callback for the start of each file upload request:
|
||||||
|
// send: function (e, data) {}, // .bind('fileuploadsend', func);
|
||||||
|
// Callback for successful uploads:
|
||||||
|
// done: function (e, data) {}, // .bind('fileuploaddone', func);
|
||||||
|
// Callback for failed (abort or error) uploads:
|
||||||
|
// fail: function (e, data) {}, // .bind('fileuploadfail', func);
|
||||||
|
// Callback for completed (success, abort or error) requests:
|
||||||
|
// always: function (e, data) {}, // .bind('fileuploadalways', func);
|
||||||
|
// Callback for upload progress events:
|
||||||
|
// progress: function (e, data) {}, // .bind('fileuploadprogress', func);
|
||||||
|
// Callback for global upload progress events:
|
||||||
|
// progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
|
||||||
|
// Callback for uploads start, equivalent to the global ajaxStart event:
|
||||||
|
// start: function (e) {}, // .bind('fileuploadstart', func);
|
||||||
|
// Callback for uploads stop, equivalent to the global ajaxStop event:
|
||||||
|
// stop: function (e) {}, // .bind('fileuploadstop', func);
|
||||||
|
// Callback for change events of the fileInput collection:
|
||||||
|
// change: function (e, data) {}, // .bind('fileuploadchange', func);
|
||||||
|
// Callback for paste events to the dropZone collection:
|
||||||
|
// paste: function (e, data) {}, // .bind('fileuploadpaste', func);
|
||||||
|
// Callback for drop events of the dropZone collection:
|
||||||
|
// drop: function (e, data) {}, // .bind('fileuploaddrop', func);
|
||||||
|
// Callback for dragover events of the dropZone collection:
|
||||||
|
// dragover: function (e) {}, // .bind('fileuploaddragover', func);
|
||||||
|
|
||||||
|
// The plugin options are used as settings object for the ajax calls.
|
||||||
|
// The following are jQuery ajax settings required for the file uploads:
|
||||||
|
processData: false,
|
||||||
|
contentType: false,
|
||||||
|
cache: false
|
||||||
|
},
|
||||||
|
|
||||||
|
// A list of options that require a refresh after assigning a new value:
|
||||||
|
_refreshOptionsList: [
|
||||||
|
'namespace',
|
||||||
|
'dropZone',
|
||||||
|
'fileInput',
|
||||||
|
'multipart',
|
||||||
|
'forceIframeTransport'
|
||||||
|
],
|
||||||
|
|
||||||
|
_isXHRUpload: function (options) {
|
||||||
|
return !options.forceIframeTransport &&
|
||||||
|
((!options.multipart && $.support.xhrFileUpload) ||
|
||||||
|
$.support.xhrFormDataFileUpload);
|
||||||
|
},
|
||||||
|
|
||||||
|
_getFormData: function (options) {
|
||||||
|
var formData;
|
||||||
|
if (typeof options.formData === 'function') {
|
||||||
|
return options.formData(options.form);
|
||||||
|
} else if ($.isArray(options.formData)) {
|
||||||
|
return options.formData;
|
||||||
|
} else if (options.formData) {
|
||||||
|
formData = [];
|
||||||
|
$.each(options.formData, function (name, value) {
|
||||||
|
formData.push({name: name, value: value});
|
||||||
|
});
|
||||||
|
return formData;
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
},
|
||||||
|
|
||||||
|
_getTotal: function (files) {
|
||||||
|
var total = 0;
|
||||||
|
$.each(files, function (index, file) {
|
||||||
|
total += file.size || 1;
|
||||||
|
});
|
||||||
|
return total;
|
||||||
|
},
|
||||||
|
|
||||||
|
_onProgress: function (e, data) {
|
||||||
|
if (e.lengthComputable) {
|
||||||
|
var total = data.total || this._getTotal(data.files),
|
||||||
|
loaded = parseInt(
|
||||||
|
e.loaded / e.total * (data.chunkSize || total),
|
||||||
|
10
|
||||||
|
) + (data.uploadedBytes || 0);
|
||||||
|
this._loaded += loaded - (data.loaded || data.uploadedBytes || 0);
|
||||||
|
data.lengthComputable = true;
|
||||||
|
data.loaded = loaded;
|
||||||
|
data.total = total;
|
||||||
|
// Trigger a custom progress event with a total data property set
|
||||||
|
// to the file size(s) of the current upload and a loaded data
|
||||||
|
// property calculated accordingly:
|
||||||
|
this._trigger('progress', e, data);
|
||||||
|
// Trigger a global progress event for all current file uploads,
|
||||||
|
// including ajax calls queued for sequential file uploads:
|
||||||
|
this._trigger('progressall', e, {
|
||||||
|
lengthComputable: true,
|
||||||
|
loaded: this._loaded,
|
||||||
|
total: this._total
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_initProgressListener: function (options) {
|
||||||
|
var that = this,
|
||||||
|
xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
|
||||||
|
// Accesss to the native XHR object is required to add event listeners
|
||||||
|
// for the upload progress event:
|
||||||
|
if (xhr.upload) {
|
||||||
|
$(xhr.upload).bind('progress', function (e) {
|
||||||
|
var oe = e.originalEvent;
|
||||||
|
// Make sure the progress event properties get copied over:
|
||||||
|
e.lengthComputable = oe.lengthComputable;
|
||||||
|
e.loaded = oe.loaded;
|
||||||
|
e.total = oe.total;
|
||||||
|
that._onProgress(e, options);
|
||||||
|
});
|
||||||
|
options.xhr = function () {
|
||||||
|
return xhr;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_initXHRData: function (options) {
|
||||||
|
var formData,
|
||||||
|
file = options.files[0],
|
||||||
|
// Ignore non-multipart setting if not supported:
|
||||||
|
multipart = options.multipart || !$.support.xhrFileUpload;
|
||||||
|
if (!multipart || options.blob) {
|
||||||
|
// For non-multipart uploads and chunked uploads,
|
||||||
|
// file meta data is not part of the request body,
|
||||||
|
// so we transmit this data as part of the HTTP headers.
|
||||||
|
// For cross domain requests, these headers must be allowed
|
||||||
|
// via Access-Control-Allow-Headers or removed using
|
||||||
|
// the beforeSend callback:
|
||||||
|
options.headers = $.extend(options.headers, {
|
||||||
|
'X-File-Name': file.name,
|
||||||
|
'X-File-Type': file.type,
|
||||||
|
'X-File-Size': file.size
|
||||||
|
});
|
||||||
|
if (!options.blob) {
|
||||||
|
// Non-chunked non-multipart upload:
|
||||||
|
options.contentType = file.type;
|
||||||
|
options.data = file;
|
||||||
|
} else if (!multipart) {
|
||||||
|
// Chunked non-multipart upload:
|
||||||
|
options.contentType = 'application/octet-stream';
|
||||||
|
options.data = options.blob;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (multipart && $.support.xhrFormDataFileUpload) {
|
||||||
|
if (options.postMessage) {
|
||||||
|
// window.postMessage does not allow sending FormData
|
||||||
|
// objects, so we just add the File/Blob objects to
|
||||||
|
// the formData array and let the postMessage window
|
||||||
|
// create the FormData object out of this array:
|
||||||
|
formData = this._getFormData(options);
|
||||||
|
if (options.blob) {
|
||||||
|
formData.push({
|
||||||
|
name: options.paramName,
|
||||||
|
value: options.blob
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
$.each(options.files, function (index, file) {
|
||||||
|
formData.push({
|
||||||
|
name: options.paramName,
|
||||||
|
value: file
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (options.formData instanceof FormData) {
|
||||||
|
formData = options.formData;
|
||||||
|
} else {
|
||||||
|
formData = new FormData();
|
||||||
|
$.each(this._getFormData(options), function (index, field) {
|
||||||
|
formData.append(field.name, field.value);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (options.blob) {
|
||||||
|
formData.append(options.paramName, options.blob, file.name);
|
||||||
|
} else {
|
||||||
|
$.each(options.files, function (index, file) {
|
||||||
|
// File objects are also Blob instances.
|
||||||
|
// This check allows the tests to run with
|
||||||
|
// dummy objects:
|
||||||
|
if (file instanceof Blob) {
|
||||||
|
formData.append(options.paramName, file, file.name);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
options.data = formData;
|
||||||
|
}
|
||||||
|
// Blob reference is not needed anymore, free memory:
|
||||||
|
options.blob = null;
|
||||||
|
},
|
||||||
|
|
||||||
|
_initIframeSettings: function (options) {
|
||||||
|
// Setting the dataType to iframe enables the iframe transport:
|
||||||
|
options.dataType = 'iframe ' + (options.dataType || '');
|
||||||
|
// The iframe transport accepts a serialized array as form data:
|
||||||
|
options.formData = this._getFormData(options);
|
||||||
|
// Add redirect url to form data on cross-domain uploads:
|
||||||
|
if (options.redirect && $('<a></a>').prop('href', options.url)
|
||||||
|
.prop('host') !== location.host) {
|
||||||
|
options.formData.push({
|
||||||
|
name: options.redirectParamName || 'redirect',
|
||||||
|
value: options.redirect
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_initDataSettings: function (options) {
|
||||||
|
if (this._isXHRUpload(options)) {
|
||||||
|
if (!this._chunkedUpload(options, true)) {
|
||||||
|
if (!options.data) {
|
||||||
|
this._initXHRData(options);
|
||||||
|
}
|
||||||
|
this._initProgressListener(options);
|
||||||
|
}
|
||||||
|
if (options.postMessage) {
|
||||||
|
// Setting the dataType to postmessage enables the
|
||||||
|
// postMessage transport:
|
||||||
|
options.dataType = 'postmessage ' + (options.dataType || '');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this._initIframeSettings(options, 'iframe');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_initFormSettings: function (options) {
|
||||||
|
// Retrieve missing options from the input field and the
|
||||||
|
// associated form, if available:
|
||||||
|
if (!options.form || !options.form.length) {
|
||||||
|
options.form = $(options.fileInput.prop('form'));
|
||||||
|
}
|
||||||
|
if (!options.paramName) {
|
||||||
|
options.paramName = options.fileInput.prop('name') ||
|
||||||
|
'files[]';
|
||||||
|
}
|
||||||
|
if (!options.url) {
|
||||||
|
options.url = options.form.prop('action') || location.href;
|
||||||
|
}
|
||||||
|
// The HTTP request method must be "POST" or "PUT":
|
||||||
|
options.type = (options.type || options.form.prop('method') || '')
|
||||||
|
.toUpperCase();
|
||||||
|
if (options.type !== 'POST' && options.type !== 'PUT') {
|
||||||
|
options.type = 'POST';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_getAJAXSettings: function (data) {
|
||||||
|
var options = $.extend({}, this.options, data);
|
||||||
|
this._initFormSettings(options);
|
||||||
|
this._initDataSettings(options);
|
||||||
|
return options;
|
||||||
|
},
|
||||||
|
|
||||||
|
// Maps jqXHR callbacks to the equivalent
|
||||||
|
// methods of the given Promise object:
|
||||||
|
_enhancePromise: function (promise) {
|
||||||
|
promise.success = promise.done;
|
||||||
|
promise.error = promise.fail;
|
||||||
|
promise.complete = promise.always;
|
||||||
|
return promise;
|
||||||
|
},
|
||||||
|
|
||||||
|
// Creates and returns a Promise object enhanced with
|
||||||
|
// the jqXHR methods abort, success, error and complete:
|
||||||
|
_getXHRPromise: function (resolveOrReject, context, args) {
|
||||||
|
var dfd = $.Deferred(),
|
||||||
|
promise = dfd.promise();
|
||||||
|
context = context || this.options.context || promise;
|
||||||
|
if (resolveOrReject === true) {
|
||||||
|
dfd.resolveWith(context, args);
|
||||||
|
} else if (resolveOrReject === false) {
|
||||||
|
dfd.rejectWith(context, args);
|
||||||
|
}
|
||||||
|
promise.abort = dfd.promise;
|
||||||
|
return this._enhancePromise(promise);
|
||||||
|
},
|
||||||
|
|
||||||
|
// Uploads a file in multiple, sequential requests
|
||||||
|
// by splitting the file up in multiple blob chunks.
|
||||||
|
// If the second parameter is true, only tests if the file
|
||||||
|
// should be uploaded in chunks, but does not invoke any
|
||||||
|
// upload requests:
|
||||||
|
_chunkedUpload: function (options, testOnly) {
|
||||||
|
var that = this,
|
||||||
|
file = options.files[0],
|
||||||
|
fs = file.size,
|
||||||
|
ub = options.uploadedBytes = options.uploadedBytes || 0,
|
||||||
|
mcs = options.maxChunkSize || fs,
|
||||||
|
// Use the Blob methods with the slice implementation
|
||||||
|
// according to the W3C Blob API specification:
|
||||||
|
slice = file.webkitSlice || file.mozSlice || file.slice,
|
||||||
|
upload,
|
||||||
|
n,
|
||||||
|
jqXHR,
|
||||||
|
pipe;
|
||||||
|
if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
|
||||||
|
options.data) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (testOnly) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (ub >= fs) {
|
||||||
|
file.error = 'uploadedBytes';
|
||||||
|
return this._getXHRPromise(
|
||||||
|
false,
|
||||||
|
options.context,
|
||||||
|
[null, 'error', file.error]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// n is the number of blobs to upload,
|
||||||
|
// calculated via filesize, uploaded bytes and max chunk size:
|
||||||
|
n = Math.ceil((fs - ub) / mcs);
|
||||||
|
// The chunk upload method accepting the chunk number as parameter:
|
||||||
|
upload = function (i) {
|
||||||
|
if (!i) {
|
||||||
|
return that._getXHRPromise(true, options.context);
|
||||||
|
}
|
||||||
|
// Upload the blobs in sequential order:
|
||||||
|
return upload(i -= 1).pipe(function () {
|
||||||
|
// Clone the options object for each chunk upload:
|
||||||
|
var o = $.extend({}, options);
|
||||||
|
o.blob = slice.call(
|
||||||
|
file,
|
||||||
|
ub + i * mcs,
|
||||||
|
ub + (i + 1) * mcs
|
||||||
|
);
|
||||||
|
// Store the current chunk size, as the blob itself
|
||||||
|
// will be dereferenced after data processing:
|
||||||
|
o.chunkSize = o.blob.size;
|
||||||
|
// Process the upload data (the blob and potential form data):
|
||||||
|
that._initXHRData(o);
|
||||||
|
// Add progress listeners for this chunk upload:
|
||||||
|
that._initProgressListener(o);
|
||||||
|
jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context))
|
||||||
|
.done(function () {
|
||||||
|
// Create a progress event if upload is done and
|
||||||
|
// no progress event has been invoked for this chunk:
|
||||||
|
if (!o.loaded) {
|
||||||
|
that._onProgress($.Event('progress', {
|
||||||
|
lengthComputable: true,
|
||||||
|
loaded: o.chunkSize,
|
||||||
|
total: o.chunkSize
|
||||||
|
}), o);
|
||||||
|
}
|
||||||
|
options.uploadedBytes = o.uploadedBytes +=
|
||||||
|
o.chunkSize;
|
||||||
|
});
|
||||||
|
return jqXHR;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
// Return the piped Promise object, enhanced with an abort method,
|
||||||
|
// which is delegated to the jqXHR object of the current upload,
|
||||||
|
// and jqXHR callbacks mapped to the equivalent Promise methods:
|
||||||
|
pipe = upload(n);
|
||||||
|
pipe.abort = function () {
|
||||||
|
return jqXHR.abort();
|
||||||
|
};
|
||||||
|
return this._enhancePromise(pipe);
|
||||||
|
},
|
||||||
|
|
||||||
|
_beforeSend: function (e, data) {
|
||||||
|
if (this._active === 0) {
|
||||||
|
// the start callback is triggered when an upload starts
|
||||||
|
// and no other uploads are currently running,
|
||||||
|
// equivalent to the global ajaxStart event:
|
||||||
|
this._trigger('start');
|
||||||
|
}
|
||||||
|
this._active += 1;
|
||||||
|
// Initialize the global progress values:
|
||||||
|
this._loaded += data.uploadedBytes || 0;
|
||||||
|
this._total += this._getTotal(data.files);
|
||||||
|
},
|
||||||
|
|
||||||
|
_onDone: function (result, textStatus, jqXHR, options) {
|
||||||
|
if (!this._isXHRUpload(options)) {
|
||||||
|
// Create a progress event for each iframe load:
|
||||||
|
this._onProgress($.Event('progress', {
|
||||||
|
lengthComputable: true,
|
||||||
|
loaded: 1,
|
||||||
|
total: 1
|
||||||
|
}), options);
|
||||||
|
}
|
||||||
|
options.result = result;
|
||||||
|
options.textStatus = textStatus;
|
||||||
|
options.jqXHR = jqXHR;
|
||||||
|
this._trigger('done', null, options);
|
||||||
|
},
|
||||||
|
|
||||||
|
_onFail: function (jqXHR, textStatus, errorThrown, options) {
|
||||||
|
options.jqXHR = jqXHR;
|
||||||
|
options.textStatus = textStatus;
|
||||||
|
options.errorThrown = errorThrown;
|
||||||
|
this._trigger('fail', null, options);
|
||||||
|
if (options.recalculateProgress) {
|
||||||
|
// Remove the failed (error or abort) file upload from
|
||||||
|
// the global progress calculation:
|
||||||
|
this._loaded -= options.loaded || options.uploadedBytes || 0;
|
||||||
|
this._total -= options.total || this._getTotal(options.files);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
|
||||||
|
this._active -= 1;
|
||||||
|
options.textStatus = textStatus;
|
||||||
|
if (jqXHRorError && jqXHRorError.always) {
|
||||||
|
options.jqXHR = jqXHRorError;
|
||||||
|
options.result = jqXHRorResult;
|
||||||
|
} else {
|
||||||
|
options.jqXHR = jqXHRorResult;
|
||||||
|
options.errorThrown = jqXHRorError;
|
||||||
|
}
|
||||||
|
this._trigger('always', null, options);
|
||||||
|
if (this._active === 0) {
|
||||||
|
// The stop callback is triggered when all uploads have
|
||||||
|
// been completed, equivalent to the global ajaxStop event:
|
||||||
|
this._trigger('stop');
|
||||||
|
// Reset the global progress values:
|
||||||
|
this._loaded = this._total = 0;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_onSend: function (e, data) {
|
||||||
|
var that = this,
|
||||||
|
jqXHR,
|
||||||
|
slot,
|
||||||
|
pipe,
|
||||||
|
options = that._getAJAXSettings(data),
|
||||||
|
send = function (resolve, args) {
|
||||||
|
that._sending += 1;
|
||||||
|
jqXHR = jqXHR || (
|
||||||
|
(resolve !== false &&
|
||||||
|
that._trigger('send', e, options) !== false &&
|
||||||
|
(that._chunkedUpload(options) || $.ajax(options))) ||
|
||||||
|
that._getXHRPromise(false, options.context, args)
|
||||||
|
).done(function (result, textStatus, jqXHR) {
|
||||||
|
that._onDone(result, textStatus, jqXHR, options);
|
||||||
|
}).fail(function (jqXHR, textStatus, errorThrown) {
|
||||||
|
that._onFail(jqXHR, textStatus, errorThrown, options);
|
||||||
|
}).always(function (jqXHRorResult, textStatus, jqXHRorError) {
|
||||||
|
that._sending -= 1;
|
||||||
|
that._onAlways(
|
||||||
|
jqXHRorResult,
|
||||||
|
textStatus,
|
||||||
|
jqXHRorError,
|
||||||
|
options
|
||||||
|
);
|
||||||
|
if (options.limitConcurrentUploads &&
|
||||||
|
options.limitConcurrentUploads > that._sending) {
|
||||||
|
// Start the next queued upload,
|
||||||
|
// that has not been aborted:
|
||||||
|
var nextSlot = that._slots.shift();
|
||||||
|
while (nextSlot) {
|
||||||
|
if (!nextSlot.isRejected()) {
|
||||||
|
nextSlot.resolve();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
nextSlot = that._slots.shift();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return jqXHR;
|
||||||
|
};
|
||||||
|
this._beforeSend(e, options);
|
||||||
|
if (this.options.sequentialUploads ||
|
||||||
|
(this.options.limitConcurrentUploads &&
|
||||||
|
this.options.limitConcurrentUploads <= this._sending)) {
|
||||||
|
if (this.options.limitConcurrentUploads > 1) {
|
||||||
|
slot = $.Deferred();
|
||||||
|
this._slots.push(slot);
|
||||||
|
pipe = slot.pipe(send);
|
||||||
|
} else {
|
||||||
|
pipe = (this._sequence = this._sequence.pipe(send, send));
|
||||||
|
}
|
||||||
|
// Return the piped Promise object, enhanced with an abort method,
|
||||||
|
// which is delegated to the jqXHR object of the current upload,
|
||||||
|
// and jqXHR callbacks mapped to the equivalent Promise methods:
|
||||||
|
pipe.abort = function () {
|
||||||
|
var args = [undefined, 'abort', 'abort'];
|
||||||
|
if (!jqXHR) {
|
||||||
|
if (slot) {
|
||||||
|
slot.rejectWith(args);
|
||||||
|
}
|
||||||
|
return send(false, args);
|
||||||
|
}
|
||||||
|
return jqXHR.abort();
|
||||||
|
};
|
||||||
|
return this._enhancePromise(pipe);
|
||||||
|
}
|
||||||
|
return send();
|
||||||
|
},
|
||||||
|
|
||||||
|
_onAdd: function (e, data) {
|
||||||
|
var that = this,
|
||||||
|
result = true,
|
||||||
|
options = $.extend({}, this.options, data),
|
||||||
|
limit = options.limitMultiFileUploads,
|
||||||
|
fileSet,
|
||||||
|
i;
|
||||||
|
if (!(options.singleFileUploads || limit) ||
|
||||||
|
!this._isXHRUpload(options)) {
|
||||||
|
fileSet = [data.files];
|
||||||
|
} else if (!options.singleFileUploads && limit) {
|
||||||
|
fileSet = [];
|
||||||
|
for (i = 0; i < data.files.length; i += limit) {
|
||||||
|
fileSet.push(data.files.slice(i, i + limit));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data.originalFiles = data.files;
|
||||||
|
$.each(fileSet || data.files, function (index, element) {
|
||||||
|
var files = fileSet ? element : [element],
|
||||||
|
newData = $.extend({}, data, {files: files});
|
||||||
|
newData.submit = function () {
|
||||||
|
newData.jqXHR = this.jqXHR =
|
||||||
|
(that._trigger('submit', e, this) !== false) &&
|
||||||
|
that._onSend(e, this);
|
||||||
|
return this.jqXHR;
|
||||||
|
};
|
||||||
|
return (result = that._trigger('add', e, newData));
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
|
||||||
|
// File Normalization for Gecko 1.9.1 (Firefox 3.5) support:
|
||||||
|
_normalizeFile: function (index, file) {
|
||||||
|
if (file.name === undefined && file.size === undefined) {
|
||||||
|
file.name = file.fileName;
|
||||||
|
file.size = file.fileSize;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_replaceFileInput: function (input) {
|
||||||
|
var inputClone = input.clone(true);
|
||||||
|
$('<form></form>').append(inputClone)[0].reset();
|
||||||
|
// Detaching allows to insert the fileInput on another form
|
||||||
|
// without loosing the file input value:
|
||||||
|
input.after(inputClone).detach();
|
||||||
|
// Avoid memory leaks with the detached file input:
|
||||||
|
$.cleanData(input.unbind('remove'));
|
||||||
|
// Replace the original file input element in the fileInput
|
||||||
|
// collection with the clone, which has been copied including
|
||||||
|
// event handlers:
|
||||||
|
this.options.fileInput = this.options.fileInput.map(function (i, el) {
|
||||||
|
if (el === input[0]) {
|
||||||
|
return inputClone[0];
|
||||||
|
}
|
||||||
|
return el;
|
||||||
|
});
|
||||||
|
// If the widget has been initialized on the file input itself,
|
||||||
|
// override this.element with the file input clone:
|
||||||
|
if (input[0] === this.element[0]) {
|
||||||
|
this.element = inputClone;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_onChange: function (e) {
|
||||||
|
var that = e.data.fileupload,
|
||||||
|
data = {
|
||||||
|
files: $.each($.makeArray(e.target.files), that._normalizeFile),
|
||||||
|
fileInput: $(e.target),
|
||||||
|
form: $(e.target.form)
|
||||||
|
};
|
||||||
|
if (!data.files.length) {
|
||||||
|
// If the files property is not available, the browser does not
|
||||||
|
// support the File API and we add a pseudo File object with
|
||||||
|
// the input value as name with path information removed:
|
||||||
|
data.files = [{name: e.target.value.replace(/^.*\\/, '')}];
|
||||||
|
}
|
||||||
|
if (that.options.replaceFileInput) {
|
||||||
|
that._replaceFileInput(data.fileInput);
|
||||||
|
}
|
||||||
|
if (that._trigger('change', e, data) === false ||
|
||||||
|
that._onAdd(e, data) === false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_onPaste: function (e) {
|
||||||
|
var that = e.data.fileupload,
|
||||||
|
cbd = e.originalEvent.clipboardData,
|
||||||
|
items = (cbd && cbd.items) || [],
|
||||||
|
data = {files: []};
|
||||||
|
$.each(items, function (index, item) {
|
||||||
|
var file = item.getAsFile && item.getAsFile();
|
||||||
|
if (file) {
|
||||||
|
data.files.push(file);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (that._trigger('paste', e, data) === false ||
|
||||||
|
that._onAdd(e, data) === false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_onDrop: function (e) {
|
||||||
|
var that = e.data.fileupload,
|
||||||
|
dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer,
|
||||||
|
data = {
|
||||||
|
files: $.each(
|
||||||
|
$.makeArray(dataTransfer && dataTransfer.files),
|
||||||
|
that._normalizeFile
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if (that._trigger('drop', e, data) === false ||
|
||||||
|
that._onAdd(e, data) === false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
e.preventDefault();
|
||||||
|
},
|
||||||
|
|
||||||
|
_onDragOver: function (e) {
|
||||||
|
var that = e.data.fileupload,
|
||||||
|
dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer;
|
||||||
|
if (that._trigger('dragover', e) === false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (dataTransfer) {
|
||||||
|
dataTransfer.dropEffect = dataTransfer.effectAllowed = 'copy';
|
||||||
|
}
|
||||||
|
e.preventDefault();
|
||||||
|
},
|
||||||
|
|
||||||
|
_initEventHandlers: function () {
|
||||||
|
var ns = this.options.namespace;
|
||||||
|
if (this._isXHRUpload(this.options)) {
|
||||||
|
this.options.dropZone
|
||||||
|
.bind('dragover.' + ns, {fileupload: this}, this._onDragOver)
|
||||||
|
.bind('drop.' + ns, {fileupload: this}, this._onDrop)
|
||||||
|
.bind('paste.' + ns, {fileupload: this}, this._onPaste);
|
||||||
|
}
|
||||||
|
this.options.fileInput
|
||||||
|
.bind('change.' + ns, {fileupload: this}, this._onChange);
|
||||||
|
},
|
||||||
|
|
||||||
|
_destroyEventHandlers: function () {
|
||||||
|
var ns = this.options.namespace;
|
||||||
|
this.options.dropZone
|
||||||
|
.unbind('dragover.' + ns, this._onDragOver)
|
||||||
|
.unbind('drop.' + ns, this._onDrop)
|
||||||
|
.unbind('paste.' + ns, this._onPaste);
|
||||||
|
this.options.fileInput
|
||||||
|
.unbind('change.' + ns, this._onChange);
|
||||||
|
},
|
||||||
|
|
||||||
|
_setOption: function (key, value) {
|
||||||
|
var refresh = $.inArray(key, this._refreshOptionsList) !== -1;
|
||||||
|
if (refresh) {
|
||||||
|
this._destroyEventHandlers();
|
||||||
|
}
|
||||||
|
$.Widget.prototype._setOption.call(this, key, value);
|
||||||
|
if (refresh) {
|
||||||
|
this._initSpecialOptions();
|
||||||
|
this._initEventHandlers();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_initSpecialOptions: function () {
|
||||||
|
var options = this.options;
|
||||||
|
if (options.fileInput === undefined) {
|
||||||
|
options.fileInput = this.element.is('input:file') ?
|
||||||
|
this.element : this.element.find('input:file');
|
||||||
|
} else if (!(options.fileInput instanceof $)) {
|
||||||
|
options.fileInput = $(options.fileInput);
|
||||||
|
}
|
||||||
|
if (!(options.dropZone instanceof $)) {
|
||||||
|
options.dropZone = $(options.dropZone);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_create: function () {
|
||||||
|
var options = this.options,
|
||||||
|
dataOpts = $.extend({}, this.element.data());
|
||||||
|
dataOpts[this.widgetName] = undefined;
|
||||||
|
$.extend(options, dataOpts);
|
||||||
|
options.namespace = options.namespace || this.widgetName;
|
||||||
|
this._initSpecialOptions();
|
||||||
|
this._slots = [];
|
||||||
|
this._sequence = this._getXHRPromise(true);
|
||||||
|
this._sending = this._active = this._loaded = this._total = 0;
|
||||||
|
this._initEventHandlers();
|
||||||
|
},
|
||||||
|
|
||||||
|
destroy: function () {
|
||||||
|
this._destroyEventHandlers();
|
||||||
|
$.Widget.prototype.destroy.call(this);
|
||||||
|
},
|
||||||
|
|
||||||
|
enable: function () {
|
||||||
|
$.Widget.prototype.enable.call(this);
|
||||||
|
this._initEventHandlers();
|
||||||
|
},
|
||||||
|
|
||||||
|
disable: function () {
|
||||||
|
this._destroyEventHandlers();
|
||||||
|
$.Widget.prototype.disable.call(this);
|
||||||
|
},
|
||||||
|
|
||||||
|
// This method is exposed to the widget API and allows adding files
|
||||||
|
// using the fileupload API. The data parameter accepts an object which
|
||||||
|
// must have a files property and can contain additional options:
|
||||||
|
// .fileupload('add', {files: filesList});
|
||||||
|
add: function (data) {
|
||||||
|
if (!data || this.options.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
data.files = $.each($.makeArray(data.files), this._normalizeFile);
|
||||||
|
this._onAdd(null, data);
|
||||||
|
},
|
||||||
|
|
||||||
|
// This method is exposed to the widget API and allows sending files
|
||||||
|
// using the fileupload API. The data parameter accepts an object which
|
||||||
|
// must have a files property and can contain additional options:
|
||||||
|
// .fileupload('send', {files: filesList});
|
||||||
|
// The method returns a Promise object for the file upload call.
|
||||||
|
send: function (data) {
|
||||||
|
if (data && !this.options.disabled) {
|
||||||
|
data.files = $.each($.makeArray(data.files), this._normalizeFile);
|
||||||
|
if (data.files.length) {
|
||||||
|
return this._onSend(null, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return this._getXHRPromise(false, data && data.context);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}));
|
|
@ -0,0 +1,165 @@
|
||||||
|
/*
|
||||||
|
* jQuery Iframe Transport Plugin 1.3
|
||||||
|
* https://github.com/blueimp/jQuery-File-Upload
|
||||||
|
*
|
||||||
|
* Copyright 2011, Sebastian Tschan
|
||||||
|
* https://blueimp.net
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license:
|
||||||
|
* http://www.opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*jslint unparam: true, nomen: true */
|
||||||
|
/*global define, window, document */
|
||||||
|
|
||||||
|
(function (factory) {
|
||||||
|
'use strict';
|
||||||
|
if (typeof define === 'function' && define.amd) {
|
||||||
|
// Register as an anonymous AMD module:
|
||||||
|
define(['jquery'], factory);
|
||||||
|
} else {
|
||||||
|
// Browser globals:
|
||||||
|
factory(window.jQuery);
|
||||||
|
}
|
||||||
|
}(function ($) {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
// Helper variable to create unique names for the transport iframes:
|
||||||
|
var counter = 0;
|
||||||
|
|
||||||
|
// The iframe transport accepts three additional options:
|
||||||
|
// options.fileInput: a jQuery collection of file input fields
|
||||||
|
// options.paramName: the parameter name for the file form data,
|
||||||
|
// overrides the name property of the file input field(s)
|
||||||
|
// options.formData: an array of objects with name and value properties,
|
||||||
|
// equivalent to the return data of .serializeArray(), e.g.:
|
||||||
|
// [{name: 'a', value: 1}, {name: 'b', value: 2}]
|
||||||
|
$.ajaxTransport('iframe', function (options) {
|
||||||
|
if (options.async && (options.type === 'POST' || options.type === 'GET')) {
|
||||||
|
var form,
|
||||||
|
iframe;
|
||||||
|
return {
|
||||||
|
send: function (_, completeCallback) {
|
||||||
|
form = $('<form style="display:none;"></form>');
|
||||||
|
// javascript:false as initial iframe src
|
||||||
|
// prevents warning popups on HTTPS in IE6.
|
||||||
|
// IE versions below IE8 cannot set the name property of
|
||||||
|
// elements that have already been added to the DOM,
|
||||||
|
// so we set the name along with the iframe HTML markup:
|
||||||
|
iframe = $(
|
||||||
|
'<iframe src="javascript:false;" name="iframe-transport-' +
|
||||||
|
(counter += 1) + '"></iframe>'
|
||||||
|
).bind('load', function () {
|
||||||
|
var fileInputClones;
|
||||||
|
iframe
|
||||||
|
.unbind('load')
|
||||||
|
.bind('load', function () {
|
||||||
|
var response;
|
||||||
|
// Wrap in a try/catch block to catch exceptions thrown
|
||||||
|
// when trying to access cross-domain iframe contents:
|
||||||
|
try {
|
||||||
|
response = iframe.contents();
|
||||||
|
// Google Chrome and Firefox do not throw an
|
||||||
|
// exception when calling iframe.contents() on
|
||||||
|
// cross-domain requests, so we unify the response:
|
||||||
|
if (!response.length || !response[0].firstChild) {
|
||||||
|
throw new Error();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
response = undefined;
|
||||||
|
}
|
||||||
|
// The complete callback returns the
|
||||||
|
// iframe content document as response object:
|
||||||
|
completeCallback(
|
||||||
|
200,
|
||||||
|
'success',
|
||||||
|
{'iframe': response}
|
||||||
|
);
|
||||||
|
// Fix for IE endless progress bar activity bug
|
||||||
|
// (happens on form submits to iframe targets):
|
||||||
|
$('<iframe src="javascript:false;"></iframe>')
|
||||||
|
.appendTo(form);
|
||||||
|
form.remove();
|
||||||
|
});
|
||||||
|
form
|
||||||
|
.prop('target', iframe.prop('name'))
|
||||||
|
.prop('action', options.url)
|
||||||
|
.prop('method', options.type);
|
||||||
|
if (options.formData) {
|
||||||
|
$.each(options.formData, function (index, field) {
|
||||||
|
$('<input type="hidden"/>')
|
||||||
|
.prop('name', field.name)
|
||||||
|
.val(field.value)
|
||||||
|
.appendTo(form);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (options.fileInput && options.fileInput.length &&
|
||||||
|
options.type === 'POST') {
|
||||||
|
fileInputClones = options.fileInput.clone();
|
||||||
|
// Insert a clone for each file input field:
|
||||||
|
options.fileInput.after(function (index) {
|
||||||
|
return fileInputClones[index];
|
||||||
|
});
|
||||||
|
if (options.paramName) {
|
||||||
|
options.fileInput.each(function () {
|
||||||
|
$(this).prop('name', options.paramName);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// Appending the file input fields to the hidden form
|
||||||
|
// removes them from their original location:
|
||||||
|
form
|
||||||
|
.append(options.fileInput)
|
||||||
|
.prop('enctype', 'multipart/form-data')
|
||||||
|
// enctype must be set as encoding for IE:
|
||||||
|
.prop('encoding', 'multipart/form-data');
|
||||||
|
}
|
||||||
|
form.submit();
|
||||||
|
// Insert the file input fields at their original location
|
||||||
|
// by replacing the clones with the originals:
|
||||||
|
if (fileInputClones && fileInputClones.length) {
|
||||||
|
options.fileInput.each(function (index, input) {
|
||||||
|
var clone = $(fileInputClones[index]);
|
||||||
|
$(input).prop('name', clone.prop('name'));
|
||||||
|
clone.replaceWith(input);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
form.append(iframe).appendTo(document.body);
|
||||||
|
},
|
||||||
|
abort: function () {
|
||||||
|
if (iframe) {
|
||||||
|
// javascript:false as iframe src aborts the request
|
||||||
|
// and prevents warning popups on HTTPS in IE6.
|
||||||
|
// concat is used to avoid the "Script URL" JSLint error:
|
||||||
|
iframe
|
||||||
|
.unbind('load')
|
||||||
|
.prop('src', 'javascript'.concat(':false;'));
|
||||||
|
}
|
||||||
|
if (form) {
|
||||||
|
form.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// The iframe transport returns the iframe content document as response.
|
||||||
|
// The following adds converters from iframe to text, json, html, and script:
|
||||||
|
$.ajaxSetup({
|
||||||
|
converters: {
|
||||||
|
'iframe text': function (iframe) {
|
||||||
|
return $(iframe[0].body).text();
|
||||||
|
},
|
||||||
|
'iframe json': function (iframe) {
|
||||||
|
return $.parseJSON($(iframe[0].body).text());
|
||||||
|
},
|
||||||
|
'iframe html': function (iframe) {
|
||||||
|
return $(iframe[0].body).html();
|
||||||
|
},
|
||||||
|
'iframe script': function (iframe) {
|
||||||
|
return $.globalEval($(iframe[0].body).text());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}));
|
|
@ -22,6 +22,11 @@
|
||||||
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
|
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="upload">
|
||||||
|
<div id="uploadprogressbar"></div>
|
||||||
|
<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Cancel upload');?>" onclick="javascript:Files.cancelUploads();" />
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="file_action_panel"></div>
|
<div id="file_action_panel"></div>
|
||||||
<?php else:?>
|
<?php else:?>
|
||||||
|
|
|
@ -21,6 +21,10 @@
|
||||||
<?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span>
|
<?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span>
|
||||||
<?php endif;?>
|
<?php endif;?>
|
||||||
</span>
|
</span>
|
||||||
|
<?php if($file['type'] == 'dir'):?>
|
||||||
|
<span class="uploadtext" currentUploads="0">
|
||||||
|
</span>
|
||||||
|
<?php endif;?>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>
|
<td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>
|
||||||
|
|
Loading…
Reference in New Issue