WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / media-template.php

diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 758c7f5c528b977561c38122a1be6d5df7efae64..6999f1bdf34f4669ee6ce93c6e42e1c42091f6e4 100644 (file)
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -50,9 +50,14 @@ function wp_underscore_audio_template() {
 function wp_underscore_video_template() {
        $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 ) {
                w = settings.contentWidth;
@@ -72,10 +77,19 @@ function wp_underscore_video_template() {
        if ( h ) {
                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 }}"<# } #>
        <?php
@@ -100,6 +114,8 @@ function wp_underscore_video_template() {
        <# if ( ! _.isEmpty( data.model.src ) ) {
                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() ] }}" />
                <# }
@@ -796,9 +812,9 @@ function wp_print_media_templates() {
        </script>
 
        <script type="text/html" id="tmpl-embed-link-settings">
-               <label class="setting title">
-                       <span><?php _e( 'Title' ); ?></span>
-                       <input type="text" class="alignment" data-setting="title" />
+               <label class="setting link-text">
+                       <span><?php _e( 'Link Text' ); ?></span>
+                       <input type="text" class="alignment" data-setting="linkText" />
                </label>
                <div class="embed-container" style="display: none;">
                        <div class="embed-preview"></div>
@@ -1092,8 +1108,7 @@ function wp_print_media_templates() {
                        <div class="embed-media-settings embed-video-settings">
                                <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;
 
                                if ( data.model.width && w !== data.model.width ) {
@@ -1190,7 +1205,7 @@ function wp_print_media_templates() {
        </script>
 
        <script type="text/html" id="tmpl-editor-gallery">
-               <# if ( data.attachments ) { #>
+               <# if ( data.attachments.length ) { #>
                        <div class="gallery gallery-columns-{{ data.columns }}">
                                <# _.each( data.attachments, function( attachment, index ) { #>
                                        <dl class="gallery-item">