Skip to content

Commit

Permalink
Front office : Implement video & photo multi-upload #319 (Thanks @Ken…
Browse files Browse the repository at this point in the history 
…meiyoki !)

---------
Co-authored-by: MacWarrior <[email protected]>
  • Loading branch information
@clement-sanz
clement-sanz authored Jan 12, 2024
1 parent 0c8e30c commit ff35e6b
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 79 deletions.
4 changes: 2 additions & 2 deletions upload/actions/file_uploader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
$vid = $Upload->submit_upload($vidDetails);

if (!$vid) {
echo json_encode(['success' => 'no', 'file_name' => $filename_without_ext]);
exit();
upload_error($eh->get_error()[0]['val']);
exit(0);
}

$Upload->add_conversion_queue($targetFileName);
Expand Down
3 changes: 2 additions & 1 deletion upload/changelog/550.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version":"5.5.0",
"revision":"327",
"revision":"328",
"status":"dev",
"detail":[
{
Expand Down Expand Up @@ -259,6 +259,7 @@
,"Fix disabled sections privacy"
,"Implement channels comments"
,"Fix sitemap & phpinfo privacy"
,"Implement video & photo multi-upload <i>#319</i> (Thanks @Kenmeiyoki !)"
]
}
,{
Expand Down
23 changes: 11 additions & 12 deletions upload/styles/cb_28/theme/js/pages/photo_upload/photo_upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,21 +185,20 @@
uploader.init();

uploader.bind('FilesAdded', function(up, uploadedFiles) {
for(var i = 0; i < uploadedFiles.length; i++){
for(let i = 0; i < uploadedFiles.length; i++){
files.push(uploadedFiles[i]);
uploadedFiles[i].data = [];
uploadedFiles[i].data.photo_title = uploadedFiles[0].name;
uploadedFiles[i].data.photo_description = uploadedFiles[0].name;
uploadedFiles[i].data.photo_tags = '';
uploadedFiles[i].data.collection_id = $('#collectionSelection').val();
uploadedFiles[i].data.allow_comments = 'yes';
uploadedFiles[i].data.allow_embedding = 'yes';
uploadedFiles[i].data.allow_rating = 'yes';
uploadedFiles[i].data.photoThumb = '';
uploadedFiles[i].data.photo_id = 0;
}

uploadedFiles[0].data = [];
uploadedFiles[0].data.photo_title = uploadedFiles[0].name;
uploadedFiles[0].data.photo_description = uploadedFiles[0].name;
uploadedFiles[0].data.photo_tags = '';
uploadedFiles[0].data.collection_id = $('#collectionSelection').val();
uploadedFiles[0].data.allow_comments = 'yes';
uploadedFiles[0].data.allow_embedding = 'yes';
uploadedFiles[0].data.allow_rating = 'yes';
uploadedFiles[0].data.photoThumb = '';
uploadedFiles[0].data.photo_id = 0;

reFreshTabs(up);

// functions added
Expand Down
2 changes: 1 addition & 1 deletion upload/styles/cb_28/theme/js/pages/photo_upload/photo_upload.min.js
View file

Large diffs are not rendered by default.

140 changes: 79 additions & 61 deletions upload/styles/cb_28/theme/js/pages/upload/upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ $(document).ready(function(){
function reFreshTabs(up)
{
// creating the selected files list
var tabs = document.createElement('ul');
tabs.id = 'selectedFilesList';
tabs.className = 'nav nav-tabs';
var ul = $('#selectedFilesList');
var li = false;
var index = 1;
var index = 0;
var uploadForm = $('#updateVideoInfoForm.template').clone();
var oneUploadForm = false;
var uploadForms = [];
plupload.each(up.files, function(file) {
li = document.createElement('li');
if(index === up.files.length){
li.className = 'active';
index++;
if($('#tab'+index).length === 0){
li = document.createElement('li');
}else{
li.className = '';
ul.find('#'+index).removeClass('active');
$('#tab'+index).removeClass('active');
return;
}
var link = document.createElement('a');
link.href = '#tab'+index;
Expand All @@ -59,11 +59,11 @@ $(document).ready(function(){
wrapperDiv.id = 'tab'+index;

if(index === up.files.length){
li.className = 'active';
wrapperDiv.className = 'tab-pane active uploadFormContainer';
} else {
wrapperDiv.className = 'tab-pane uploadFormContainer';
}

$(oneUploadForm).find(".cancel_button").attr('to_cancel',index);
$(oneUploadForm).find("input[name='title']").val(file.data.title);
$(oneUploadForm).find("textarea[name='description']").val(file.data.description);
Expand Down Expand Up @@ -101,7 +101,6 @@ $(document).ready(function(){
alert_shown = false;
}
});

if(file.data.broadcast === 'unlisted'){
$(oneUploadForm).find('#video_password').attr('disabled',false);
} else if(file.data.broadcast === 'private') {
Expand All @@ -123,13 +122,12 @@ $(document).ready(function(){
wrapperDiv.appendChild(oneUploadForm);
uploadForms.push(wrapperDiv);

li.id = index++;
li.id = index;
li.appendChild(link);
tabs.appendChild(li);
ul.append(li);
});

$('#files').html('').append(tabs);
$('#allUploadForms').html('').append(uploadForms);
$('#allUploadForms').append(uploadForms);

$("#allUploadForms input, " +
"#allUploadForms textarea, " +
Expand Down Expand Up @@ -164,30 +162,30 @@ $(document).ready(function(){
});

uploader.bind('FilesAdded', function(up, uploadedFiles) {
let i;
$("#uploadMore").addClass("hidden");

const filename = uploadedFiles[0].name;
let filename_without_extension = filename.substring(0, filename.lastIndexOf('.'));
if( filename_without_extension.length > max_video_title ){
filename_without_extension = filename_without_extension.substring(0, max_video_title);
for(i = 0; i < uploadedFiles.length; i++) {
const filename = uploadedFiles[i].name;
let filename_without_extension = filename.substring(0, filename.lastIndexOf('.'));
if( filename_without_extension.length > max_video_title ){
filename_without_extension = filename_without_extension.substring(0, max_video_title);
}
uploadedFiles[i].data = [];
uploadedFiles[i].data.title = filename_without_extension;
uploadedFiles[i].data.description = filename_without_extension;
uploadedFiles[i].data.tags = '';
uploadedFiles[i].data.country = default_country_iso2;
uploadedFiles[i].data.location = '';
uploadedFiles[i].data.datecreated = date_format_time;
uploadedFiles[i].data.broadcast = '';
uploadedFiles[i].data.video_password = '';
uploadedFiles[i].data.video_users = '';
uploadedFiles[i].data.allow_comments = 'yes';
uploadedFiles[i].data.comment_voting = 'yes';
uploadedFiles[i].data.allow_rating = 'yes';
uploadedFiles[i].data.allow_embedding = 'yes';
uploadedFiles[i].data['category[]'] = [get_default_cid];
}

uploadedFiles[0].data = [];
uploadedFiles[0].data.title = filename_without_extension;
uploadedFiles[0].data.description = filename_without_extension;
uploadedFiles[0].data.tags = '';
uploadedFiles[0].data.country = default_country_iso2;
uploadedFiles[0].data.location = '';
uploadedFiles[0].data.datecreated = date_format_time;
uploadedFiles[0].data.broadcast = '';
uploadedFiles[0].data.video_password = '';
uploadedFiles[0].data.video_users = '';
uploadedFiles[0].data.allow_comments = 'yes';
uploadedFiles[0].data.comment_voting = 'yes';
uploadedFiles[0].data.allow_rating = 'yes';
uploadedFiles[0].data.allow_embedding = 'yes';
uploadedFiles[0].data['category[]'] = [get_default_cid];

reFreshTabs(up);

//function for real progress bar
Expand All @@ -204,15 +202,14 @@ $(document).ready(function(){
//end function

var index = 1;
for (var i = 0; i < up.files.length; i++ ){
for (i = 0; i < up.files.length; i++ ){
if( up.files[i].file_name !== undefined ){
var hiddenField_fileName = document.createElement('input');
hiddenField_fileName.name = 'file_name';
hiddenField_fileName.type = 'hidden';
hiddenField_fileName.value = up.files[i].file_name;
$('#tab'+index+' form').append(hiddenField_fileName);
}

if( up.files[i].show_duration === true ){
$('#tab'+index+' #duration').removeClass('hidden').removeAttr('disabled');
}
Expand Down Expand Up @@ -283,32 +280,44 @@ $(document).ready(function(){
*/

var filesUploaded = 0;
var errors = [];

uploader.bind('FileUploaded', function(up, fileDetails, response)
{
$('#overallProgress').css('width', ((100/up.files.length)*(++filesUploaded))+"%");
$('#overallProgress').parents('.row').find('#uploadedFilesInfo').text('Inserted ' + (filesUploaded) + ' of ' + up.files.length);
var serverResponse = $.parseJSON(response.response);

var id_error = '';
if (serverResponse.error) {
errors.push(serverResponse.error);
$('.progress-bar_'+fileDetails.id).addClass('progress-bar-danger');
id_error = fileDetails.id;
}else {
filesUploaded++;
}
$('#overallProgress').css('width', ((100/up.files.length)*(filesUploaded))+"%");
$('#overallProgress').parents('.row').find('#uploadedFilesInfo').text('Inserted ' + (filesUploaded) + ' of ' + up.files.length);
var index = 1;
plupload.each(up.files,function(file) {
if( file.id === fileDetails.id ){
file.file_name = serverResponse.file_name;

var hiddenField_fileName = document.createElement('input');
hiddenField_fileName.name = 'file_name';
hiddenField_fileName.type = 'hidden';
hiddenField_fileName.value = serverResponse.file_name;
$('#tab'+index+' form').append(hiddenField_fileName);

if(serverResponse.extension === 'mp4' && stay_mp4 === 'yes' ){
file.show_duration = true;
$('#tab'+index+' #duration').removeClass('hidden').removeAttr('disabled');
if (id_error === file.id) {
$('#tab'+index+' form').find(':input').attr('disabled','disabled');
} else {
file.show_duration = false;
}
file.file_name = serverResponse.file_name;

var hiddenField_fileName = document.createElement('input');
hiddenField_fileName.name = 'file_name';
hiddenField_fileName.type = 'hidden';
hiddenField_fileName.value = serverResponse.file_name;
$('#tab'+index+' form').append(hiddenField_fileName);

if(serverResponse.extension === 'mp4' && stay_mp4 === 'yes' ){
file.show_duration = true;
$('#tab'+index+' #duration').removeClass('hidden').removeAttr('disabled');
} else {
file.show_duration = false;
}

$('#tab'+index+' .saveVideoDetails').removeAttr('disabled');
$('#tab'+index+' .saveVideoDetails').removeAttr('disabled');
}
}
index++
});
Expand Down Expand Up @@ -366,20 +375,29 @@ $(document).ready(function(){
// remove cancel button
$(".cancel_button[to_cancel='" + pluploadFileId + "']").fadeOut('slow');
// turn progress bar into green to show success
$('.progress-bar_'+pluploadFileId).addClass('progress-bar-success');
if (!$('.progress-bar_'+pluploadFileId).hasClass('progress-bar-danger')) {
$('.progress-bar_'+pluploadFileId).addClass('progress-bar-success');
}
}
});

uploader.bind('UploadComplete', function(plupload, files){
$("#fileUploadProgress").addClass('hidden');

$("#uploadMore").removeClass('hidden');
$(".uploadingProgressContainer").hide();
uploader.refresh();
$("#uploadMessage").html('File uploaded successfully').attr('class', 'alert alert-success container');
setTimeout(function(){
$("#uploadMessage").addClass('hidden');
}, 5000);
if (errors.length > 0 ) {
$("#uploadMessage").html('');
errors.forEach(function (error) {
$("#uploadMessage").append(error).attr('class', 'alert alert-danger container');
});
errors = [];
} else {
$("#uploadMessage").html('File uploaded successfully').attr('class', 'alert alert-success container');
setTimeout(function(){
$("#uploadMessage").addClass('hidden');
}, 5000);
}
});

uploader.bind('error', function(up, err) {
Expand Down
Loading

0 comments on commit ff35e6b

Please sign in to comment.