WordPress.org

Make WordPress Core

Changeset 9465


Ignore:
Timestamp:
11/01/2008 05:20:55 PM (11 years ago)
Author:
ryan
Message:

Make sure Upload button always shows. Props filosofo. see #6979

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/media.php

    r9458 r9465  
    12191219<script type="text/javascript">
    12201220<!--
    1221 jQuery(function($){
     1221SWFUpload.onload = function() {
    12221222    swfu = new SWFUpload({
    12231223            button_text: '<span class="button"><?php _e('Upload'); ?></span>',
     
    12571257            debug: false
    12581258        });
    1259 });
     1259};
    12601260//-->
    12611261</script>
  • trunk/wp-includes/js/swfupload/handlers.js

    r9438 r9465  
    207207
    208208function swfuploadPreLoad() {
     209    var swfupload_element = jQuery('#'+swfu.customSettings.swfupload_element_id).get(0);
    209210    jQuery('#' + swfu.customSettings.degraded_element_id).hide();
    210     jQuery('#' + swfu.customSettings.swfupload_element_id).show();
     211    // Doing this directly because jQuery().show() seems to have timing problems
     212    if ( swfupload_element && ! swfupload_element.style.display )
     213            swfupload_element.style.display = 'block';
    211214}
    212215
  • trunk/wp-includes/script-loader.php

    r9451 r9465  
    110110    ) );
    111111    $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031');
    112     $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081031');
     112    $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081101');
    113113    // these error messages came from the sample swfupload js, they might need changing.
    114114    $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
Note: See TracChangeset for help on using the changeset viewer.