Changeset 19257 for trunk/wp-admin/includes/media.php

Timestamp:

11/11/2011 07:40:23 PM (14 years ago)

Author:

azaozz

Message:

Bring back the multi-file/html uploader switching, see #19228

File:

• trunk/wp-admin/includes/media.php (modified) (8 diffs)

trunk/wp-admin/includes/media.php

@@ -1337 +1337 @@
 
 <script type="text/javascript">
-var resize_height = <?php echo get_option('large_size_h', 1024); ?>,
-resize_width = <?php echo get_option('large_size_w', 1024); ?>,
+var resize_height = <?php echo get_option('large_size_h', 1024); ?>, resize_width = <?php echo get_option('large_size_w', 1024); ?>,
 wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
+
+jQuery(document).ready(function($){
+    function _switch(m) {
+        if ( m ) {
+            deleteUserSetting('uploader');
+            $('.media-upload-form').removeClass('html-uploader');
+
+            if ( typeof(uploader) == 'object' )
+                uploader.refresh();
+        } else {
+            setUserSetting('uploader', '1'); // 1 == html uploader
+            $('.media-upload-form').addClass('html-uploader');
+        }
+    }
+    $('.upload-flash-bypass a').click(function(){_switch(0);return false;});
+    $('.upload-html-bypass a').click(function(){_switch(1);return false;});
+});
 </script>
 
@@ -1389 +1405 @@
     $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
     $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+    $form_class = 'media-upload-form type-form validate';
+
+    if ( get_user_setting('uploader') )
+        $form_class .= ' html-uploader';
 ?>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
 <?php submit_button( '', 'hidden', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
@@ -1450 +1470 @@
     $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
     $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+    $form_class = 'media-upload-form type-form validate';
+
+    if ( get_user_setting('uploader') )
+        $form_class .= ' html-uploader';
 ?>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
@@ -1572 +1596 @@
     $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
     $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+    $form_class = 'media-upload-form validate';
+    
+    if ( get_user_setting('uploader') )
+        $form_class .= ' html-uploader';
 ?>
 
@@ -1596 +1624 @@
 <a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
 </div>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
@@ -1714 +1742 @@
     $form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id");
     $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+    $form_class = 'media-upload-form validate';
+
+    if ( get_user_setting('uploader') )
+        $form_class .= ' html-uploader';
 
     $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
@@ -1831 +1863 @@
 </form>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="library-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="library-form">
 
 <?php wp_nonce_field('media-form'); ?>
@@ -1991 +2023 @@
  * @since 2.6.0
  */
+function media_upload_flash_bypass() {
+    ?>
+    <p class="upload-flash-bypass">
+    <?php _e('You are using the multi-file uploader. Problems? Try the <a href="#">Browser uploader</a> instead.'); ?>
+    </p>
+    <?php
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.6.0
+ */
+function media_upload_html_bypass() {
+    ?>
+    <p class="upload-html-bypass hide-if-no-js">
+    <?php _e('You are using the Browser uploader. Try the <a href="#">Multi-file uploader</a> instead.'); ?>
+    </p>
+    <?php
+}
+
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.6.0
+ */
 function media_upload_max_image_resize() {
     $checked = get_user_setting('upload_resize') ? ' checked="true"' : '';