Changeset 23989

Timestamp:

04/14/2013 04:43:26 PM (12 years ago)

Author:

markjaquith

Message:

Constrain large videos from rendering bigger than $content_width on both frontend and backend.

props wonderboymusic. fixes #23955.

Location:

trunk

Files:

• wp-admin/js/post-formats.js (modified) (1 diff)
• wp-content/themes/twentythirteen/functions.php (modified) (1 diff)
• wp-includes/media.php (modified) (2 diffs)

trunk/wp-admin/js/post-formats.js

@@ -112 +112 @@
 
             mediaPreview = function (attachment) {
-                var dimensions = '', url = attachment.url,
+                var w, h, dimensions = '', url = attachment.url,
                     mime = attachment.mime,
                     format = attachment.type;
 
                 if ( 'video' === format ) {
-                    if ( attachment.width )
-                        dimensions += ' width="' + attachment.width + '"';
-                    if ( attachment.height )
-                        dimensions += ' height="' + attachment.height + '"';
+                    if ( attachment.width ) {
+                        w = attachment.width;
+                        if ( w > 600 )
+                            w = 600;
+                        dimensions += ' width="' + w + '"';
+                    }
+
+                    if ( attachment.height ) {
+                        h = attachment.height;
+                        if ( attachment.width && w < attachment.width )
+                            h = Math.round( ( h * w ) / attachment.width );
+                        dimensions += ' height="' + h + '"';
+                    }
                 }
 

trunk/wp-content/themes/twentythirteen/functions.php

@@ -548 +548 @@
  */
 function twentythirteen_video_width( $atts ) {
-    if ( has_post_format( 'video' ) )
-        $atts['width'] = 724;
+    if ( ! is_admin() && has_post_format( 'video' ) ) {
+        $new_width = 724;
+        $atts['height'] = round( ( $atts['height'] * $new_width ) / $atts['width'] );
+        $atts['width'] = $new_width;
+    }
 
     return $atts;

trunk/wp-includes/media.php

@@ -957 +957 @@
         'width' => empty( $content_width ) ? 640 : $content_width,
     );
+
     foreach ( $default_types as $type  )
         $defaults_atts[$type] = '';
@@ -962 +963 @@
     $atts = shortcode_atts( $defaults_atts, $attr, 'video' );
     extract( $atts );
+
+    $w = $width;
+    $h = $height;
+    if ( is_admin() && $width > 600 )
+        $w = 600;
+    elseif ( ! is_admin() && $w > $defaults_atts['width'] )
+        $w = $defaults_atts['width'];
+
+    if ( $w < $width )
+        $height = round( ( $h * $w ) / $width );
+
+    $width = $w;
 
     $primary = false;