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

Timestamp:

08/09/2014 08:43:25 PM (12 years ago)

Author:

wonderboymusic

Message:

Upgrade MediaElement to 2.15.0:

• It is required to set height on the parent .wp-video wrapper for video
• Fixes the play button hover problem in Chrome
• Includes my pull request: ​https://github.com/johndyer/mediaelement/pull/1273

All changes:
​https://github.com/johndyer/mediaelement/compare/2.14.2...master

See #29110.

File:

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

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

@@ -51 +51 @@
         $video_types = wp_get_video_extensions();
 ?>
-<#  var w_rule = '',
+<#  var w_rule = h_rule = '',
                 w, h, settings = wp.media.view.settings,
                 isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
@@ -68 +68 @@
 
         if ( w ) {
-                w_rule = ' width: ' + w + 'px;';
+                w_rule = 'width: ' + w + 'px; ';
+        }
+        if ( h ) {
+                h_rule = 'height: ' + h + 'px;';
         }
 #>
-<div style="{{ w_rule }}" class="wp-video">
+<div style="{{ w_rule }}{{ h_rule }}" class="wp-video">
 <video controls
         class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
@@ -287 +290 @@
                                 </div>
                                 <# } else if ( 'video' === data.type ) {
-                                        var w_rule = '';
+                                        var w_rule = h_rule = '';
                                         if ( data.width ) {
                                                 w_rule = 'width: ' + data.width + 'px;';
@@ -293 +296 @@
                                                 w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;';
                                         }
+                                        if ( data.height ) {
+                                                h_rule = 'height: ' + data.height + 'px;';
+                                        }
                                 #>
-                                <div style="{{ w_rule }}" class="wp-media-wrapper wp-video">
+                                <div style="{{ w_rule }}{{ h_rule }}" class="wp-media-wrapper wp-video">
                                         <video controls="controls" class="wp-video-shortcode" preload="metadata"
                                                 <# if ( data.width ) { #>width="{{ data.width }}"<# } #>