mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-06-28 22:30:04 +00:00
Media library work from andy. see #5911
git-svn-id: https://develop.svn.wordpress.org/trunk@6974 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
@@ -1,5 +1,6 @@
|
||||
function uploadLoadedMultimedia() {
|
||||
jQuery("#html-upload-ui").empty();
|
||||
function uploadLoaded() {
|
||||
jQuery("#html-upload-ui").remove();
|
||||
jQuery("#flash-upload-ui").show();
|
||||
}
|
||||
|
||||
function fileDialogStart() {
|
||||
@@ -7,7 +8,7 @@ function fileDialogStart() {
|
||||
}
|
||||
|
||||
// progress and success handlers for multimedia multi uploads
|
||||
function fileQueuedMultimedia(fileObj) {
|
||||
function fileQueued(fileObj) {
|
||||
// Create a progress bar containing the filename
|
||||
jQuery('#multimedia-items').append('<div id="multimedia-item-' + fileObj.id + '" class="multimedia-item"><span class="filename original">' + fileObj.name + '</span><div class="progress"><div class="bar"></div></div></div>');
|
||||
|
||||
@@ -15,12 +16,14 @@ function fileQueuedMultimedia(fileObj) {
|
||||
jQuery('#insert-multimedia').attr('disabled', 'disabled');
|
||||
}
|
||||
|
||||
function uploadProgressMultimedia(fileObj, bytesDone, bytesTotal) {
|
||||
function uploadStart(fileObj) { return true; }
|
||||
|
||||
function uploadProgress(fileObj, bytesDone, bytesTotal) {
|
||||
// Lengthen the progress bar
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' .bar').width(620*bytesDone/bytesTotal);
|
||||
}
|
||||
|
||||
function uploadSuccessMultimedia(fileObj, serverData) {
|
||||
function uploadSuccess(fileObj, serverData) {
|
||||
// if async-upload returned an error message, place it in the multimedia item div and return
|
||||
if ( serverData.match('media-upload-error') ) {
|
||||
jQuery('#multimedia-item-' + fileObj.id).html(serverData);
|
||||
@@ -34,7 +37,7 @@ function uploadSuccessMultimedia(fileObj, serverData) {
|
||||
jQuery('#multimedia-item-' + fileObj.id).append(serverData);
|
||||
|
||||
// Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail').prependTo('#multimedia-item-' + fileObj.id);
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail toggle').prependTo('#multimedia-item-' + fileObj.id);
|
||||
|
||||
// Replace the original filename with the new (unique) one assigned during upload
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#multimedia-item-' + fileObj.id + ' .filename.new'));
|
||||
@@ -46,50 +49,24 @@ function uploadSuccessMultimedia(fileObj, serverData) {
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' a.toggle').bind('click', function(){jQuery(this).siblings('.slidetoggle').slideToggle(150);jQuery(this).parent().eq(0).children('.toggle').toggle();jQuery(this).siblings('a.toggle').focus();return false;});
|
||||
|
||||
// Bind AJAX to the new Delete button
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' a.delete').bind('click',function(){jQuery.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/[^0-9]/g,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});jQuery(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){jQuery(this).remove();});return false;});
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' a.delete').bind('click',function(){jQuery.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/[^0-9]/g,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});jQuery(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){jQuery(this).remove();if(jQuery('.multimedia-item').length==0)jQuery('.insert-gallery').hide();});return false;});
|
||||
|
||||
// Open this item if it says to start open
|
||||
jQuery('#multimedia-item-' + fileObj.id + ' .startopen')
|
||||
.removeClass('startopen')
|
||||
.slideToggle(500)
|
||||
.parent().eq(0).children('.toggle').toggle();
|
||||
|
||||
jQuery('.insert-gallery').show();
|
||||
}
|
||||
|
||||
function uploadCompleteMultimedia(fileObj) {
|
||||
function uploadComplete(fileObj) {
|
||||
// If no more uploads queued, enable the submit button
|
||||
if ( swfu.getStats().files_queued == 0 )
|
||||
jQuery('#insert-multimedia').attr('disabled', '');
|
||||
}
|
||||
|
||||
|
||||
// progress and success handlers for single image upload
|
||||
|
||||
function uploadLoadedImage() {
|
||||
jQuery('#image-alt').attr('disabled', true);
|
||||
jQuery('#image-url').attr('disabled', true);
|
||||
jQuery('#image-title').attr('disabled', true);
|
||||
jQuery('#image-add').attr('disabled', true);
|
||||
}
|
||||
|
||||
function fileQueuedImage(fileObj) {
|
||||
jQuery('#flash-upload-ui').append('<div id="image-progress"><p class="filename">' + fileObj.name + '</p><div class="progress"><div class="bar"></div></div></div>');
|
||||
}
|
||||
|
||||
function uploadProgressImage(fileObj, bytesDone, bytesTotal) {
|
||||
jQuery('#image-progress .bar').width(450*bytesDone/bytesTotal);
|
||||
}
|
||||
|
||||
function uploadSuccessImage(fileObj, serverData) {
|
||||
if ( serverData.match('media-upload-error') ) {
|
||||
jQuery('#media-upload-error').replaceWith(serverData);
|
||||
jQuery('#image-progress').replaceWith('');
|
||||
}
|
||||
else {
|
||||
jQuery('#media-upload-error').replaceWith('');
|
||||
jQuery('#flash-upload-ui').replaceWith(serverData);
|
||||
}
|
||||
}
|
||||
|
||||
// wp-specific error handlers
|
||||
|
||||
// generic message
|
||||
@@ -121,14 +98,6 @@ function fileQueueError(fileObj, error_code, message) {
|
||||
}
|
||||
}
|
||||
|
||||
function fileQueued(fileObj) {
|
||||
try {
|
||||
var txtFileName = document.getElementById("txtFileName");
|
||||
txtFileName.value = fileObj.name;
|
||||
} catch (e) { }
|
||||
|
||||
}
|
||||
|
||||
function fileDialogComplete(num_files_queued) {
|
||||
try {
|
||||
if (num_files_queued > 0) {
|
||||
@@ -139,171 +108,33 @@ function fileDialogComplete(num_files_queued) {
|
||||
}
|
||||
}
|
||||
|
||||
function uploadProgress(fileObj, bytesLoaded, bytesTotal) {
|
||||
|
||||
try {
|
||||
var percent = Math.ceil((bytesLoaded / bytesTotal) * 100)
|
||||
|
||||
fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file
|
||||
var progress = new FileProgress(fileObj, this.customSettings.progress_target);
|
||||
progress.SetProgress(percent);
|
||||
progress.SetStatus("Uploading...");
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
function uploadSuccess(fileObj, server_data) {
|
||||
try {
|
||||
fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file
|
||||
var progress = new FileProgress(fileObj, this.customSettings.progress_target);
|
||||
progress.SetComplete();
|
||||
progress.SetStatus("Complete.");
|
||||
progress.ToggleCancel(false);
|
||||
|
||||
if (server_data === " ") {
|
||||
this.customSettings.upload_successful = false;
|
||||
} else {
|
||||
this.customSettings.upload_successful = true;
|
||||
document.getElementById("hidFileID").value = server_data;
|
||||
}
|
||||
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
function uploadComplete(fileObj) {
|
||||
try {
|
||||
if (this.customSettings.upload_successful) {
|
||||
document.getElementById("btnBrowse").disabled = "true";
|
||||
uploadDone();
|
||||
} else {
|
||||
fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file
|
||||
var progress = new FileProgress(fileObj, this.customSettings.progress_target);
|
||||
progress.SetError();
|
||||
progress.SetStatus("File rejected");
|
||||
progress.ToggleCancel(false);
|
||||
|
||||
var txtFileName = document.getElementById("txtFileName");
|
||||
txtFileName.value = "";
|
||||
//validateForm();
|
||||
|
||||
alert("There was a problem with the upload.\nThe server did not accept it.");
|
||||
}
|
||||
} catch (e) { }
|
||||
}
|
||||
|
||||
function uploadError(fileObj, error_code, message) {
|
||||
|
||||
// first the file specific error
|
||||
if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) {
|
||||
wpFileError(fileObj, swfuploadL10n.missing_upload_url);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) {
|
||||
wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
|
||||
}
|
||||
else {
|
||||
wpFileError(fileObj, swfuploadL10n.default_error);
|
||||
}
|
||||
|
||||
// not sure if this is needed
|
||||
fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file
|
||||
var progress = new FileProgress(fileObj, this.customSettings.progress_target);
|
||||
progress.SetError();
|
||||
progress.ToggleCancel(false);
|
||||
alert(message);return;
|
||||
// first the file specific error
|
||||
if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) {
|
||||
wpFileError(fileObj, swfuploadL10n.missing_upload_url);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) {
|
||||
wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
|
||||
}
|
||||
else {
|
||||
wpFileError(fileObj, swfuploadL10n.default_error);
|
||||
}
|
||||
|
||||
// now the general upload status
|
||||
if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) {
|
||||
wpQueueError(swfuploadL10n.http_error);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) {
|
||||
wpQueueError(swfuploadL10n.upload_failed);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) {
|
||||
wpQueueError(swfuploadL10n.io_error);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) {
|
||||
wpQueueError(swfuploadL10n.security_error);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) {
|
||||
wpQueueError(swfuploadL10n.security_error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* ********************************************************
|
||||
* Utility for displaying the file upload information
|
||||
* This is not part of SWFUpload, just part of the demo
|
||||
* ******************************************************** */
|
||||
function FileProgress(fileObj, target_id) {
|
||||
this.file_progress_id = fileObj.id;
|
||||
|
||||
this.fileProgressElement = document.getElementById(this.file_progress_id);
|
||||
if (!this.fileProgressElement) {
|
||||
this.fileProgressElement = document.createElement("div");
|
||||
this.fileProgressElement.className = "progressContainer";
|
||||
this.fileProgressElement.id = this.file_progress_id;
|
||||
|
||||
var progressCancel = document.createElement("a");
|
||||
progressCancel.className = "progressCancel";
|
||||
progressCancel.href = "#";
|
||||
progressCancel.style.visibility = "hidden";
|
||||
progressCancel.appendChild(document.createTextNode(" "));
|
||||
|
||||
var progressText = document.createElement("div");
|
||||
progressText.className = "progressName";
|
||||
progressText.appendChild(document.createTextNode(fileObj.name));
|
||||
|
||||
var progressBar = document.createElement("div");
|
||||
progressBar.className = "progressBarInProgress";
|
||||
|
||||
var progressStatus = document.createElement("div");
|
||||
progressStatus.className = "progressBarStatus";
|
||||
progressStatus.innerHTML = " ";
|
||||
|
||||
this.fileProgressElement.appendChild(progressCancel);
|
||||
this.fileProgressElement.appendChild(progressText);
|
||||
this.fileProgressElement.appendChild(progressStatus);
|
||||
this.fileProgressElement.appendChild(progressBar);
|
||||
|
||||
document.getElementById(target_id).appendChild(this.fileProgressElement);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
FileProgress.prototype.SetStart = function() {
|
||||
this.fileProgressElement.className = "progressContainer";
|
||||
this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
|
||||
this.fileProgressElement.childNodes[3].style.width = "";
|
||||
}
|
||||
|
||||
FileProgress.prototype.SetProgress = function(percentage) {
|
||||
this.fileProgressElement.className = "progressContainer green";
|
||||
this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
|
||||
this.fileProgressElement.childNodes[3].style.width = percentage + "%";
|
||||
}
|
||||
FileProgress.prototype.SetComplete = function() {
|
||||
this.fileProgressElement.className = "progressContainer blue";
|
||||
this.fileProgressElement.childNodes[3].className = "progressBarComplete";
|
||||
this.fileProgressElement.childNodes[3].style.width = "";
|
||||
|
||||
|
||||
}
|
||||
FileProgress.prototype.SetError = function() {
|
||||
this.fileProgressElement.className = "progressContainer red";
|
||||
this.fileProgressElement.childNodes[3].className = "progressBarError";
|
||||
this.fileProgressElement.childNodes[3].style.width = "";
|
||||
}
|
||||
FileProgress.prototype.SetCancelled = function() {
|
||||
this.fileProgressElement.className = "progressContainer";
|
||||
this.fileProgressElement.childNodes[3].className = "progressBarError";
|
||||
this.fileProgressElement.childNodes[3].style.width = "";
|
||||
}
|
||||
FileProgress.prototype.SetStatus = function(status) {
|
||||
this.fileProgressElement.childNodes[2].innerHTML = status;
|
||||
}
|
||||
|
||||
FileProgress.prototype.ToggleCancel = function(show, upload_obj) {
|
||||
this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden";
|
||||
if (upload_obj) {
|
||||
var file_id = this.file_progress_id;
|
||||
this.fileProgressElement.childNodes[0].onclick = function() { upload_obj.cancelUpload(file_id); return false; };
|
||||
}
|
||||
// now the general upload status
|
||||
if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) {
|
||||
wpQueueError(swfuploadL10n.http_error);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) {
|
||||
wpQueueError(swfuploadL10n.upload_failed);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) {
|
||||
wpQueueError(swfuploadL10n.io_error);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) {
|
||||
wpQueueError(swfuploadL10n.security_error);
|
||||
}
|
||||
else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) {
|
||||
wpQueueError(swfuploadL10n.security_error);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user