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

Timestamp:

12/31/2014 08:40:05 PM (12 years ago)

Author:

wonderboymusic

Message:

Support chromeless Vimeo via MEjs:

• Bump MediaElement script loader versions to 2.16.2 - missed in [30634], oops!
• Add Froogaloop to js/mediaelement scripts for Vimeo
• Check for Vimeo in the same locations that YouTube is checked
• Dynamically load Froogaloop script in admin when editing a TinyMCE view
• Edit MediaElement to call mejs.$.extend instead of $.extend in mejs.HtmlMediaElementShim.createPlugin(), since $ is not available via WP's jQuery (I will report this upstream):

​https://github.com/johndyer/mediaelement/blob/6f9a78e008de2de796a1797077a74a94763320f9/src/js/me-shim.js#L631

Fixes #29267.

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 = h_rule = '',
+<#  var w_rule = h_rule = '', classes = [],
                 w, h, settings = wp.media.view.settings,
-                isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
+                isYouTube = isVimeo = false;
+
+        if ( ! _.isEmpty( data.model.src ) ) {
+                isYouTube = data.model.src.match(/youtube|youtu\.be/);
+                isVimeo = -1 !== data.model.src.indexOf('vimeo');
+        }
 
         if ( settings.contentWidth && data.model.width >= settings.contentWidth ) {
@@ -73 +78 @@
                 h_rule = 'height: ' + h + 'px;';
         }
+
+        if ( isYouTube ) {
+                classes.push( 'youtube-video' );
+        }
+
+        if ( isVimeo ) {
+                classes.push( 'vimeo-video' );
+        }
+
 #>
 <div style="{{ w_rule }}{{ h_rule }}" class="wp-video">
 <video controls
-        class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
+        class="wp-video-shortcode {{ classes.join( ' ' ) }}"
         <# if ( w ) { #>width="{{ w }}"<# } #>
         <# if ( h ) { #>height="{{ h }}"<# } #>
@@ -101 +115 @@
                 if ( isYouTube ) { #>
                 <source src="{{ data.model.src }}" type="video/youtube" />
+                <# } else if ( isVimeo ) { #>
+                <source src="{{ data.model.src }}" type="video/vimeo" />
                 <# } else { #>
                 <source src="{{ data.model.src }}" type="{{ settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
@@ -1093 +1109 @@
                                 <div class="wp-video-holder">
                                 <#
-                                var isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
-                                        w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
+                                var w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
                                         h = ! data.model.height ? 360 : data.model.height;