Changeset 34048 for trunk/src/wp-includes/media-template.php

Timestamp:

09/11/2015 06:26:53 PM (9 years ago)

Author:

wonderboymusic

Message:

In [30082], hardcoded heights were removed on the front end for videos rendered via shortcode. These values were not removed from the admin, which was an oversight.

See #33798.

File:

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

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

@@ -51 +51 @@
     $video_types = wp_get_video_extensions();
 ?>
-<#  var w_rule = h_rule = '', classes = [],
+<#  var w_rule = '', classes = [],
         w, h, settings = wp.media.view.settings,
         isYouTube = isVimeo = false;
@@ -68 +68 @@
     if ( w !== data.model.width ) {
         h = Math.ceil( ( data.model.height * w ) / data.model.width );
-    } else {
-        h = data.model.height;
     }
 
@@ -75 +73 @@
         w_rule = 'width: ' + w + 'px; ';
     }
-    if ( h ) {
-        h_rule = 'height: ' + h + 'px;';
-    }
 
     if ( isYouTube ) {
@@ -88 +83 @@
 
 #>
-<div style="{{ w_rule }}{{ h_rule }}" class="wp-video">
+<div style="{{ w_rule }}" class="wp-video">
 <video controls
     class="wp-video-shortcode {{ classes.join( ' ' ) }}"
@@ -309 +304 @@
                 </div>
                 <# } else if ( 'video' === data.type ) {
-                    var w_rule = h_rule = '';
+                    var w_rule = '';
                     if ( data.width ) {
                         w_rule = 'width: ' + data.width + 'px;';
@@ -315 +310 @@
                         w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;';
                     }
-                    if ( data.height ) {
-                        h_rule = 'height: ' + data.height + 'px;';
-                    }
                 #>
-                <div style="{{ w_rule }}{{ h_rule }}" class="wp-media-wrapper wp-video">
+                <div style="{{ w_rule }}" class="wp-media-wrapper wp-video">
                     <video controls="controls" class="wp-video-shortcode" preload="metadata"
                         <# if ( data.width ) { #>width="{{ data.width }}"<# } #>