sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@9465 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-11-01 17:20:55 +00:00
parent 16acf7d11c
commit c786488346
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/media.php
View File

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

5
wp-includes/js/swfupload/handlers.js
View File

@ -206,8 +206,11 @@ function fileDialogComplete(num_files_queued) {
} }
function swfuploadPreLoad() { function swfuploadPreLoad() {
var swfupload_element = jQuery('#'+swfu.customSettings.swfupload_element_id).get(0);
jQuery('#' + swfu.customSettings.degraded_element_id).hide(); 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() { function swfuploadLoadFailed() {

2
wp-includes/script-loader.php
View File

@ -109,7 +109,7 @@ function wp_default_scripts( &$scripts ) {
'is_lighttpd_before_150' => is_lighttpd_before_150(), 'is_lighttpd_before_150' => is_lighttpd_before_150(),
) ); ) );
$scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031'); $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031');
$scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081031'); $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081101');
// these error messages came from the sample swfupload js, they might need changing. // these error messages came from the sample swfupload js, they might need changing.
$scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array( $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
'queue_limit_exceeded' => __('You have attempted to queue too many files.'), 'queue_limit_exceeded' => __('You have attempted to queue too many files.'),