vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Media library updates from andy. see #5911

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@7092 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-02-28 21:29:51 +00:00
parent 41fe914d9e
commit b2e8a6ac54
5 changed files with 431 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/js/swfupload/handlers.js
+20 -10
View File
@@ -9,8 +9,10 @@ function fileDialogStart() {
// progress and success handlers for media multi uploads
function fileQueued(fileObj) {
// Get rid of unused form
jQuery('.media-blank').remove();
// Create a progress bar containing the filename
jQuery('#media-items').prepend('<div id="media-item-' + fileObj.id + '" class="media-item"><span class="filename original">' + fileObj.name + '</span><div class="progress"><div class="bar"></div></div></div>');
jQuery('#media-items').prepend('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><span class="filename original">' + fileObj.name + '</span><div class="progress"><div class="bar"></div></div></div>');
// Disable the submit button
jQuery('#insert-media').attr('disabled', 'disabled');
@@ -50,8 +52,13 @@ function prepareMediaItem(fileObj, serverData) {
action : 'delete-post',
_ajax_nonce : this.href.replace(/^.*wpnonce=/,'')}
});
// Decrement the counter.
jQuery('#attachments-count').text(jQuery('#attachments-count').text()-1);
// Decrement the counters.
if ( type = jQuery('#type-of-' + this.id.replace(/[^0-9]/g,'')).val() )
jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-1);
if ( jQuery(this).parents('.media-item').eq(0).hasClass('child-of-'+post_id) )
jQuery('#attachments-count').text(jQuery('#attachments-count').text()-1);
// Vanish it.
jQuery(this).parents(".media-item").eq(0).slideToggle(300,function(){jQuery(this).remove();if(jQuery('.media-item').length==0)jQuery('.insert-gallery').hide();updateMediaForm();});
return false;
@@ -66,11 +73,11 @@ function prepareMediaItem(fileObj, serverData) {
function updateMediaForm() {
// Just one file, no need for collapsible part
if ( jQuery('#computer-form #media-items>*').length == 1 ) {
if ( jQuery('.type-form #media-items>*').length == 1 ) {
jQuery('#media-items .slidetoggle').slideDown(500).parent().eq(0).children('.toggle').toggle();
jQuery('#computer-form .slidetoggle').siblings().addClass('hidden');
jQuery('.type-form .slidetoggle').siblings().addClass('hidden');
} else {
jQuery('#computer-form .slidetoggle').siblings().removeClass('hidden');
jQuery('.type-form .slidetoggle').siblings().removeClass('hidden');
}
// Only show Gallery button when there are at least two files.
@@ -88,7 +95,10 @@ function uploadSuccess(fileObj, serverData) {
}
prepareMediaItem(fileObj, serverData);
updateMediaForm();
jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
// Increment the counter.
if ( jQuery('#media-item-' + fileObj.id).hasClass('child-of-' + post_id) )
jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
}
function uploadComplete(fileObj) {
@@ -116,13 +126,13 @@ function fileQueueError(fileObj, error_code, message) {
wpQueueError(swfuploadL10n.queue_limit_exceeded);
}
else if ( error_code == SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT ) {
wpQueueError(swfuploadL10n.file_exceeds_size_limit);
wpFileError(fileObj, swfuploadL10n.file_exceeds_size_limit);
}
else if ( error_code == SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE ) {
wpQueueError(swfuploadL10n.zero_byte_file);
wpFileError(fileObj, swfuploadL10n.zero_byte_file);
}
else if ( error_code == SWFUpload.QUEUE_ERROR.INVALID_FILETYPE ) {
wpQueueError(swfuploadL10n.invalid_filetype);
wpFileError(fileObj, swfuploadL10n.invalid_filetype);
}
else {
wpQueueError(swfuploadL10n.default_error);
wp-includes/script-loader.php
+1 -1
View File
@@ -88,7 +88,7 @@ class WP_Scripts {
$this->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.0.2');
$this->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.0.2');
$this->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2');
$this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080225');
$this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080227');
// these error messages came from the sample swfupload js, they might need changing.
$this->localize( 'swfupload-handlers', 'swfuploadL10n', array(
'queue_limit_exceeded' => 'You have attempted to queue too many files.',