X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..bf5c68485ef07868ad0a91168ecd0092af7661ae:/wp-includes/js/swfupload/handlers.dev.js diff --git a/wp-includes/js/swfupload/handlers.dev.js b/wp-includes/js/swfupload/handlers.dev.js index fb11c924..e72ed69b 100644 --- a/wp-includes/js/swfupload/handlers.dev.js +++ b/wp-includes/js/swfupload/handlers.dev.js @@ -1,3 +1,4 @@ +var topWin = window.dialogArguments || opener || parent || top; function fileDialogStart() { jQuery("#media-upload-error").empty(); @@ -19,11 +20,16 @@ function fileQueued(fileObj) { jQuery('.progress', '#media-item-' + fileObj.id).show(); // Disable submit and enable cancel - jQuery('#insert-gallery').attr('disabled', 'disabled'); - jQuery('#cancel-upload').attr('disabled', ''); + jQuery('#insert-gallery').prop('disabled', true); + jQuery('#cancel-upload').prop('disabled', false); } function uploadStart(fileObj) { + try { + if ( typeof topWin.tb_remove != 'undefined' ) + topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove); + } catch(e){} + return true; } @@ -43,6 +49,11 @@ function prepareMediaItem(fileObj, serverData) { jQuery('.bar', item).remove(); jQuery('.progress', item).hide(); + try { + if ( typeof topWin.tb_remove != 'undefined' ) + topWin.jQuery('#TB_overlay').click(topWin.tb_remove); + } catch(e){} + // Old style: Append the HTML returned by the server -- thumbnail and form inputs if ( isNaN(serverData) || !serverData ) { item.append(serverData); @@ -57,7 +68,7 @@ function prepareMediaItem(fileObj, serverData) { function prepareMediaItemInit(fileObj) { var item = jQuery('#media-item-' + fileObj.id); // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename - jQuery('.thumbnail', item).clone().attr('className', 'pinkynail toggle').prependTo(item); + jQuery('.thumbnail', item).clone().attr('class', 'pinkynail toggle').prependTo(item); // Replace the original filename with the new (unique) one assigned during upload jQuery('.filename.original', item).replaceWith( jQuery('.filename.new', item) ); @@ -134,10 +145,15 @@ function prepareMediaItemInit(fileObj) { } function itemAjaxError(id, html) { - var error = jQuery('#media-item-error' + id); - - error.html('