<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49195] trunk/src: Media: Add an audio and video player to the media manager modal.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49195">49195</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49195","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-18 17:37:19 +0000 (Sun, 18 Oct 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Add an audio and video player to the media manager modal.
This introduces a means of playing existing audio and video files while browsing them prior to selecting them for use.
Props antpb, Mista-Flo, garrett-eclipse, mapk
Fixes <a href="https://core.trac.wordpress.org/ticket/43640">#43640</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjsmediaviewsattachmentdetailstwocolumnjs">trunk/src/js/media/views/attachment/details-two-column.js</a></li>
<li><a href="#trunksrcjsmediaviewsattachmentdetailsjs">trunk/src/js/media/views/attachment/details.js</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjsmediaviewsattachmentdetailstwocolumnjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachment/details-two-column.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachment/details-two-column.js 2020-10-18 17:31:37 UTC (rev 49194)
+++ trunk/src/js/media/views/attachment/details-two-column.js 2020-10-18 17:37:19 UTC (rev 49195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,17 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Noop this from parent class, doesn't apply here.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- toggleSelectionHandler: function() {},
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toggleSelectionHandler: function() {}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 );
- } );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = TwoColumn;
</span></span></pre></div>
<a id="trunksrcjsmediaviewsattachmentdetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachment/details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachment/details.js 2020-10-18 17:31:37 UTC (rev 49194)
+++ trunk/src/js/media/views/attachment/details.js 2020-10-18 17:37:19 UTC (rev 49195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,6 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.moveFocus();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Untrashes an attachment.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,6 +258,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.controller.trigger( 'attachment:details:shift-tab', event );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+
+ 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 );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/media-views.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/media-views.css 2020-10-18 17:31:37 UTC (rev 49194)
+++ trunk/src/wp-includes/css/media-views.css 2020-10-18 17:37:19 UTC (rev 49195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1765,6 +1765,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding-bottom: 11px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.attachment-info .wp-media-wrapper {
+ margin-bottom: 8px;
+}
+
+.attachment-info .wp-media-wrapper.wp-audio {
+ margin-top: 13px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .attachment-info .filename {
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 600;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #444;
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2020-10-18 17:31:37 UTC (rev 49194)
+++ trunk/src/wp-includes/media-template.php 2020-10-18 17:37:19 UTC (rev 49195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'audio' === data.type ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="wp-media-wrapper">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="wp-media-wrapper wp-audio">
</ins><span class="cx" style="display: block; padding: 0 10px"> <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
</span><span class="cx" style="display: block; padding: 0 10px"> <source type="{{ data.mime }}" src="{{ data.url }}"/>
</span><span class="cx" style="display: block; padding: 0 10px"> </audio>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,15 +595,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment-info">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <# 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>
+ <# } #>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="details">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="filename">{{ data.filename }}</div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="uploaded">{{ data.dateFormatted }}</div>
</span></span></pre>
</div>
</div>
</body>
</html>