diff options
| author | Andrew Nacin <nacin@git.wordpress.org> | 2013-06-21 03:46:51 +0000 |
|---|---|---|
| committer | Andrew Nacin <nacin@git.wordpress.org> | 2013-06-21 03:46:51 +0000 |
| commit | 0c96244c7078795417a462a6297bb638bb3f4dcc (patch) | |
| tree | 4f1c3ae43608d59543f8817a05a4472b2e326132 | |
| parent | 7e6cb76eb1da9cfe6efc85addfeb3310c01d70a2 (diff) | |
| download | wordpress-0c96244c7078795417a462a6297bb638bb3f4dcc.tar.gz wordpress-0c96244c7078795417a462a6297bb638bb3f4dcc.zip | |
Build the media item HTML in a clearer manner in the legacy Plupload handler JS. Also update the retired SWFUpload handler JS.
Merges [24472] to the 3.5 branch.
git-svn-id: https://develop.svn.wordpress.org/branches/3.5@24473 602fd350-edb4-49c9-b593-d223f7449a82
| -rw-r--r-- | wp-includes/js/plupload/handlers.js | 7 | ||||
| -rw-r--r-- | wp-includes/js/swfupload/handlers.js | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/wp-includes/js/plupload/handlers.js b/wp-includes/js/plupload/handlers.js index e903f5709e..0b9937c4db 100644 --- a/wp-includes/js/plupload/handlers.js +++ b/wp-includes/js/plupload/handlers.js @@ -16,7 +16,12 @@ function fileQueued(fileObj) { items.removeClass('open').find('.slidetoggle').slideUp(200); } // Create a progress bar containing the filename - jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + postid + '"><div class="progress"><div class="percent">0%</div><div class="bar"></div></div><div class="filename original"> ' + fileObj.name + '</div></div>'); + jQuery('<div class="media-item">') + .attr( 'id', 'media-item-' + fileObj.id ) + .addClass('child-of-' + postid) + .append('<div class="progress"><div class="percent">0%</div><div class="bar"></div></div>', + jQuery('<div class="filename original">').text( ' ' + fileObj.name )) + .appendTo( jQuery('#media-items' ) ); // Disable submit jQuery('#insert-gallery').prop('disabled', true); diff --git a/wp-includes/js/swfupload/handlers.js b/wp-includes/js/swfupload/handlers.js index 7296cb6766..f38172c38d 100644 --- a/wp-includes/js/swfupload/handlers.js +++ b/wp-includes/js/swfupload/handlers.js @@ -15,7 +15,12 @@ function fileQueued(fileObj) { jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden'); } // Create a progress bar containing the filename - jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><div class="progress"><div class="bar"></div></div><div class="filename original"><span class="percent"></span> ' + fileObj.name + '</div></div>'); + jQuery('<div class="media-item">') + .attr( 'id', 'media-item-' + fileObj.id ) + .addClass('child-of-' + post_id) + .append('<div class="progress"><div class="bar"></div></div>', + jQuery('<div class="filename original"><span class="percent"></span>').text( ' ' + fileObj.name )) + .appendTo( jQuery('#media-items' ) ); // Display the progress div jQuery('.progress', '#media-item-' + fileObj.id).show(); |