Changeset 21014 for trunk/wp-includes/media.php

Timestamp:

06/06/2012 09:45:17 PM (13 years ago)

Author:

koopersmith

Message:

Theme Customizer: Fix scrolling on iOS and Kindle Fire. props azaozz, helenyhou. fixes #20805.

Also fixes uploader UIs on iOS and Kindle Fire by improving wp.Uploader.
Adds mobile viewport specifications.
Moves scrollbar back to fixed positioning.

File:

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

trunk/wp-includes/media.php

@@ -1468 +1468 @@
     $max_upload_size = wp_max_upload_size();
 
-    $settings = array(
+    $defaults = array(
         'runtimes'            => 'html5,silverlight,flash,html4',
         'file_data_name'      => 'async-upload', // key passed to $_FILE.
@@ -1481 +1481 @@
     );
 
-    $settings = apply_filters( 'plupload_default_settings', $settings );
+    $defaults = apply_filters( 'plupload_default_settings', $defaults );
 
     $params = array(
@@ -1489 +1489 @@
     $params = apply_filters( 'plupload_default_params', $params );
     $params['_wpnonce'] = wp_create_nonce( 'media-form' );
-    $settings['multipart_params'] = $params;
-
-    $script = 'var wpPluploadDefaults = ' . json_encode( $settings ) . ';';
+    $defaults['multipart_params'] = $params;
+
+    $settings = array(
+        'defaults' => $defaults,
+        'browser'  => array(
+            'mobile'    => wp_is_mobile(),
+            'supported' => _device_can_upload(),
+        ),
+    );
+
+    $script = 'var _wpPluploadSettings = ' . json_encode( $settings ) . ';';
 
     $data = $wp_scripts->get_data( 'wp-plupload', 'data' );