Changeset 27655 for trunk/src/wp-includes/media.php

Timestamp:

03/22/2014 11:25:08 PM (13 years ago)

Author:

wonderboymusic

Message:

General code cleanup and improving video sizing in the admin:

• Abstract the setting of a primary button and its callback in wp.media.view.MediaFrame.MediaDetails
• Account for the existence or non-existence of $content_width in the TinyMCE views for video
• Make sure video models always have dimensions, even if they are the defaults
• For browsers that are not Firefox, don't use a timeout when setting the MediaElementPlayer instance in TinyMCE views

See #27320.

File:

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

trunk/src/wp-includes/media.php

@@ -1198 +1198 @@
         $default_height = 360;
 
-        $theme_width = $content_width - $outer;
-        $theme_height = round( ( $default_height * $theme_width ) / $default_width );
+        $theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer );
+        $theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
 
         $data = compact( 'type', 'style' );
@@ -1586 +1586 @@
         } else {
                 // if the video is bigger than the theme
-                if ( $width > $content_width ) {
+                if ( ! empty( $content_width ) && $width > $content_width ) {
                         $height = round( ( $height * $content_width ) / $width );
                         $width = $content_width;
@@ -2382 +2382 @@
                 return;
 
+        global $content_width;
+
         $defaults = array(
                 'post' => null,
@@ -2432 +2434 @@
                 'attachmentCounts' => wp_count_attachments(),
                 'embedExts'    => $exts,
-                'embedMimes'   => $ext_mimes
+                'embedMimes'   => $ext_mimes,
+                'contentWidth' => $content_width,
         );