Ticket #43640: 43640.4.diff

src/js/media/views/attachment/details-two-column.js

@@ -37 +37 @@
          */
         toggleSelectionHandler: function() {},
 
-        render: function() {
-                Details.prototype.render.apply( this, arguments );
-
-                wp.media.mixin.removeAllPlayers();
-                this.$( 'audio, video' ).each( function (i, elem) {
-                        var el = wp.media.view.MediaDetails.prepareSrc( elem );
-                        new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
-                } );
-        }
 });
 
 module.exports = TwoColumn;

src/js/media/views/attachment/details.js

@@ -198 +198 @@
                         this.moveFocus();
                 }
         },
+
         /**
          * Untrashes an attachment.
          *
@@ -257 +258 @@
                         this.controller.trigger( 'attachment:details:shift-tab', event );
                         return false;
                 }
+        },
+
+        render: function() {
+                Attachment.prototype.render.apply( this, arguments );
+
+                wp.media.mixin.removeAllPlayers();
+                this.$( 'audio, video' ).each( function (i, elem) {
+                        var el = wp.media.view.MediaDetails.prepareSrc( elem );
+                        new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
+                } );
         }
 });
 

src/wp-includes/css/media-views.css

@@ -1765 +1765 @@
         padding-bottom: 11px;
 }
 
+.attachment-info .wp-media-wrapper {
+        margin-bottom: 8px;
+}
+
+.attachment-info .wp-media-wrapper.wp-audio {
+        margin-top: 12px;
+}
+
 .attachment-info .filename {
         font-weight: 600;
         color: #444;

src/wp-includes/media-template.php

@@ -366 +366 @@
                                 <# } #>
 
                                 <# if ( 'audio' === data.type ) { #>
-                                <div class="wp-media-wrapper">
+                                <div class="wp-media-wrapper wp-audio">
                                         <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
                                                 <source type="{{ data.mime }}" src="{{ data.url }}"/>
                                         </audio>
@@ -595 +595 @@
                         </span>
                 </h2>
                 <div class="attachment-info">
-                        <div class="thumbnail thumbnail-{{ data.type }}">
-                                <# if ( data.uploading ) { #>
-                                        <div class="media-progress-bar"><div></div></div>
-                                <# } else if ( 'image' === data.type && data.size && data.size.url ) { #>
-                                        <img src="{{ data.size.url }}" draggable="false" alt="" />
-                                <# } else { #>
-                                        <img src="{{ data.icon }}" class="icon" draggable="false" alt="" />
-                                <# } #>
-                        </div>
+
+                        <# if ( 'audio' === data.type ) { #>
+                                <div class="wp-media-wrapper wp-audio">
+                                        <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
+                                                <source type="{{ data.mime }}" src="{{ data.url }}"/>
+                                        </audio>
+                                </div>
+                        <# } else if ( 'video' === data.type ) {
+                                var w_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;';
+                                }
+                        #>
+                                <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 }}"<# } #>
+                                                <# 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 }}"/>
+                                        </video>
+                                </div>
+                        <# } else { #>
+                                <div class="thumbnail thumbnail-{{ data.type }}">
+                                        <# if ( data.uploading ) { #>
+                                                <div class="media-progress-bar"><div></div></div>
+                                        <# } else if ( 'image' === data.type && data.size && data.size.url ) { #>
+                                                <img src="{{ data.size.url }}" draggable="false" alt="" />
+                                        <# } else { #>
+                                                <img src="{{ data.icon }}" class="icon" draggable="false" alt="" />
+                                        <# } #>
+                                </div>
+                        <# } #>
+
                         <div class="details">
                                 <div class="filename">{{ data.filename }}</div>
                                 <div class="uploaded">{{ data.dateFormatted }}</div>