Ticket #6979: swfupload_show_timing.diff

wp-includes/js/swfupload/handlers.js

@@ -206 +206 @@
 }
 
 function swfuploadPreLoad() {
+        var swfupload_element = jQuery('#'+swfu.customSettings.swfupload_element_id).get(0);
         jQuery('#' + swfu.customSettings.degraded_element_id).hide();
-        jQuery('#' + swfu.customSettings.swfupload_element_id).show();
+        // Doing this directly because jQuery().show() seems to have timing problems
+        if ( swfupload_element && ! swfupload_element.style.display )
+                        swfupload_element.style.display = 'block';
 }
 
 function swfuploadLoadFailed() {

wp-admin/includes/media.php

@@ -1218 +1218 @@
 <?php if ( $flash ) : ?>
 <script type="text/javascript">
 <!--
-jQuery(function($){
+SWFUpload.onload = function() {
         swfu = new SWFUpload({
                         button_text: '<span class="button"><?php _e('Upload'); ?></span>',
                         button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; }',
@@ -1256 +1256 @@
                         },
                         debug: false
                 });
-});
+};
 //-->
 </script>