Changeset 29429

Timestamp:

08/07/2014 05:52:03 AM (12 years ago)

Author:

wonderboymusic

Message:

MediaElement upgrade: cleanup for generated markup for videos.

See #29110.

Location:

trunk/src/wp-includes

Files:

• media-template.php (modified) (3 diffs)
• media.php (modified) (1 diff)
• post-template.php (modified) (1 diff)

trunk/src/wp-includes/media-template.php

@@ -51 +51 @@
     $video_types = wp_get_video_extensions();
 ?>
-<#  var w, h, settings = wp.media.view.settings,
+<#  var w_rule = '', h_rule = '',
+        w, h, settings = wp.media.view.settings,
         isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
 
@@ -65 +66 @@
         h = data.model.height;
     }
+
+    if ( w ) {
+        w_rule = ' width: ' + w + 'px;';
+    }
+
+    if ( h ) {
+        h_rule = ' height: ' + h + 'px;';
+    }
 #>
-<div style="max-width: 100%; width: {{ w }}px">
+<div style="max-width: 100%;{{ w_rule }}{{ h_rule }}">
 <video controls
     class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
-    width="{{ w }}"
-    height="{{ h }}"
+    <# if ( w ) { #>width="{{ w }}"<# } #>
+    <# if ( h ) { #>height="{{ h }}"<# } #>
     <?php
     $props = array( 'poster' => '', 'preload' => 'metadata' );
@@ -281 +290 @@
                     </audio>
                 </div>
-                <# } else if ( 'video' === data.type ) { #>
-                <div style="max-width: 100%; width: {{ data.width }}px" class="wp-media-wrapper">
+                <# } else if ( 'video' === data.type ) {
+                    var w_rule = h_rule = '';
+                    if ( data.width ) {
+                        w_rule = ' width: ' + data.width + 'px;';
+                    } else if ( wp.media.view.settings.contentWidth ) {
+                        w_rule = ' width: ' + wp.media.view.settings.contentWidth + 'px;';
+                    }
+                    if ( data.height ) {
+                        h_rule = ' height: ' + data.height + 'px;';
+                    }
+                #>
+                <div style="max-width: 100%; {{ w_rule }}{{ h_rule }}" class="wp-media-wrapper">
                     <video controls class="wp-video-shortcode" preload="metadata"
-                        width="{{ data.width }}" height="{{ data.height }}"
+                        <# if ( data.width ) { #>width="{{ data.width }}"<# } #>
+                        <# if ( data.height ) { #>height="{{ data.height }}"<# } #>
                         <# if ( data.image && data.image.src !== data.icon ) { #>poster="{{ data.image.src }}"<# } #>>
                         <source type="{{ data.mime }}" src="{{ data.url }}"/>

trunk/src/wp-includes/media.php

@@ -1875 +1875 @@
     $html .= '</video>';
 
-    $output = sprintf( '<div style="width: %dpx; max-width: 100%%;" class="wp-video">%s</div>', $atts['width'], $html );
+    $width_rule = $height_rule = '';
+    if ( ! empty( $atts['width'] ) ) {
+        $width_rule = sprintf( ' width: %dpx;', $atts['width'] );
+    }
+    if ( ! empty( $atts['height'] ) ) {
+        $height_rule = sprintf( ' height: %dpx;', $atts['height'] );
+    }
+    $output = sprintf( '<div style="max-width: 100%%;%s%s" class="wp-video">%s</div>', $width_rule, $height_rule, $html );
 
     /**

trunk/src/wp-includes/post-template.php

@@ -1521 +1521 @@
             $atts['height'] = (int) $meta['height'];
         }
+        if ( has_post_thumbnail() ) {
+            $atts['poster'] = wp_get_attachment_url( get_post_thumbnail_id() );
+        }
         $p = wp_video_shortcode( $atts );
     } elseif ( 0 === strpos( $post->post_mime_type, 'audio' ) ) {