<!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>[27476] trunk/src/wp-includes: Audio/Video shortcodes in the media 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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27476">27476</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-09 01:00:53 +0000 (Sun, 09 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Audio/Video shortcodes in the media modal:
* Add `embedMimes` to `_wpMediaViewsL10n`
* Use `escape` instead of `interpolate` when setting attributes in Underscore templates
* When creating the `<audio>` and `<video>` tags dynamically, set inner `<source>` nodes instead of the `src` attribute and properly set the mime-type per source as the `type` attribute. This is also drastically reduces the amount of code used to generate the tags.
See <a href="http://core.trac.wordpress.org/ticket/27016">#27016</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27475 => 27476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-08 21:53:51 UTC (rev 27475)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-09 01:00:53 UTC (rev 27476)
</span><span class="lines">@@ -6435,18 +6435,27 @@
</span><span class="cx"> }, this.options );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ /**
+ * When multiple players in the DOM contain the same src, things get weird.
+ *
+ * @param {HTMLElement} media
+ * @returns {HTMLElement}
+ */
</ins><span class="cx"> prepareSrc : function (media) {
</span><del>- media.src = [
- media.src,
- media.src.indexOf('?') > -1 ? '&' : '?',
- (new Date()).getTime()
- ].join('');
</del><ins>+ var t = (new Date()).getTime();
+ _.each( $(media).find('source'), function (source) {
+ source.src = [
+ source.src,
+ source.src.indexOf('?') > -1 ? '&' : '?',
+ t
+ ].join('');
+ });
</ins><span class="cx">
</span><span class="cx"> return media;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setPlayer : function () {
</span><del>- if ( ! this.player ) {
</del><ins>+ if ( ! this.player && this.media ) {
</ins><span class="cx"> this.player = new MediaElementPlayer( this.media, this.settings );
</span><span class="cx"> }
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27475 => 27476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-08 21:53:51 UTC (rev 27475)
+++ trunk/src/wp-includes/media-template.php 2014-03-09 01:00:53 UTC (rev 27476)
</span><span class="lines">@@ -662,50 +662,42 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-audio-details">
</span><del>- <?php // reusing .media-embed to pick up the styles for now
- ?><# var rendered = false; #>
</del><ins>+ <?php $audio_types = wp_get_audio_extensions(); ?>
</ins><span class="cx"> <div class="media-embed">
</span><span class="cx"> <div class="embed-media-settings embed-audio-settings">
</span><del>- <# if ( data.model.src ) { #>
- <audio controls
- class="wp-audio-shortcode"
- src="{{{ data.model.src }}}"
- preload="{{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}}"
- <#
- <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
- ?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
- #> <?php echo $attr ?><#
- }
- <?php endforeach ?>#>
- />
- <# rendered = true; #>
</del><ins>+ <audio controls
+ class="wp-audio-shortcode"
+ preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"
+ <#
+ <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+ ?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
+ #> <?php echo $attr ?><#
+ }
+ <?php endforeach ?>#>
+ >
+ <# if ( ! _.isEmpty( data.model.src ) ) { #>
+ <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
+ <# } #>
+
+ <?php foreach ( $audio_types as $type ):
+ ?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
+ <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
+ <# } #>
+ <?php endforeach;
+ ?></audio>
+ <# if ( ! _.isEmpty( data.model.src ) ) { #>
</ins><span class="cx"> <label class="setting">
</span><span class="cx"> <span>SRC</span>
</span><del>- <input type="text" disabled="disabled" data-setting="src" value="{{{ data.model.src }}}" />
</del><ins>+ <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php
</span><del>- $default_types = wp_get_audio_extensions();
</del><span class="cx">
</span><del>- foreach ( $default_types as $type ):
- ?><# if ( data.model.<?php echo $type ?> ) { #>
- <# if ( ! rendered ) { #>
- <audio controls
- class="wp-audio-shortcode"
- src="{{{ data.model.<?php echo $type ?> }}}"
- preload="{{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}}"
- <#
- <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
- ?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
- #> <?php echo $attr ?><#
- }
- <?php endforeach ?>#>
- />
- <# rendered = true;
- } #>
</del><ins>+ foreach ( $audio_types as $type ):
+ ?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
</ins><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php echo strtoupper( $type ) ?></span>
</span><del>- <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{{ data.model.<?php echo $type ?> }}}" />
</del><ins>+ <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php endforeach ?>
</span><span class="lines">@@ -734,8 +726,7 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-video-details">
</span><del>- <?php // reusing .media-embed to pick up the styles for now
- ?><# var rendered = false; #>
</del><ins>+ <?php $video_types = wp_get_video_extensions(); ?>
</ins><span class="cx"> <div class="media-embed">
</span><span class="cx"> <div class="embed-media-settings embed-video-settings">
</span><span class="cx"> <div class="wp-video-holder">
</span><span class="lines">@@ -746,117 +737,69 @@
</span><span class="cx"> if ( data.model.width && w !== data.model.width ) {
</span><span class="cx"> h = Math.ceil( ( h * w ) / data.model.width );
</span><span class="cx"> }
</span><del>-
- if ( data.model.src ) {
- if ( data.model.src.match(/youtube|youtu\.be/) ) {
</del><span class="cx"> #>
</span><del>- <video controls
- class="wp-video-shortcode youtube-video"
- width="{{{ w }}}"
- height="{{{ h }}}"
- <?php
- $props = array( 'poster' => '', 'preload' => 'metadata' );
- foreach ( $props as $key => $value ):
- if ( empty( $value ) ) {
- ?><#
- if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
- #> <?php echo $key ?>="{{{ data.model.<?php echo $key ?> }}}"<#
- } #>
- <?php } else {
- echo $key ?>="{{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}}"<?php
- }
- endforeach;
</del><ins>+ <video controls
+ class="wp-video-shortcode youtube-video"
+ width="{{ w }}"
+ height="{{ h }}"
+ <?php
+ $props = array( 'poster' => '', 'preload' => 'metadata' );
+ foreach ( $props as $key => $value ):
+ if ( empty( $value ) ) {
</ins><span class="cx"> ?><#
</span><del>- <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
- ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
- #> <?php echo $attr ?><#
</del><ins>+ if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
+ #> <?php echo $key ?>="{{ data.model.<?php echo $key ?> }}"<#
+ } #>
+ <?php } else {
+ echo $key ?>="{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}"<?php
</ins><span class="cx"> }
</span><del>- <?php endforeach ?>#>
- >
- <source type="video/youtube" src="{{{ data.model.src }}}" />
- </video>
- <#
- } else {
- #>
- <video controls
- class="wp-video-shortcode"
- width="{{{ w }}}"
- height="{{{ h }}}"
- src="{{{ data.model.src }}}"
- <?php
- $props = array( 'poster' => '', 'preload' => 'metadata' );
- foreach ( $props as $key => $value ):
- if ( empty( $value ) ) {
- ?><#
- if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
- #> <?php echo $key ?>="{{{ data.model.<?php echo $key ?> }}}"<#
- } #>
- <?php } else {
- echo $key ?>="{{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}}"<?php
- }
- endforeach;
- ?><#
- <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
- ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
- #> <?php echo $attr ?><#
- }
- <?php endforeach ?>#>
- />
</del><ins>+ endforeach;
+ ?><#
+ <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+ ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
+ #> <?php echo $attr ?><#
+ }
+ <?php endforeach ?>#>
+ >
+ <# if ( ! _.isEmpty( data.model.src ) ) {
+ if ( data.model.src.match(/youtube|youtu\.be/) ) { #>
+ <source src="{{ data.model.src }}" type="video/youtube" />
+ <# } else { #>
+ <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
+ <# }
+ } #>
+
+ <?php foreach ( $video_types as $type ):
+ ?><# if ( data.model.<?php echo $type ?> ) { #>
+ <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
+ <# } #>
+ <?php endforeach;
+ ?></video>
+ <# if ( ! _.isEmpty( data.model.src ) ) { #>
</ins><span class="cx"> <label class="setting">
</span><span class="cx"> <span>SRC</span>
</span><del>- <input type="text" disabled="disabled" data-setting="src" value="{{{ data.model.src }}}" />
</del><ins>+ <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</ins><span class="cx"> </label>
</span><del>- <# }
- rendered = true;
- } #>
- <?php
- $default_types = wp_get_video_extensions();
-
- foreach ( $default_types as $type ):
- ?><# if ( data.model.<?php echo $type ?> ) {
- if ( ! rendered ) { #>
- <video controls
- class="wp-video-shortcode"
- width="{{{ w }}}"
- height="{{{ h }}}"
- src="{{{ data.model.<?php echo $type ?> }}}"
- <?php
- $props = array( 'poster' => '', 'preload' => 'metadata' );
- foreach ( $props as $key => $value ):
- echo $key ?>="{{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}}"
- <?php endforeach;
- ?><#
- <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
- ?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
- #> <?php echo $attr ?><#
- }
- <?php endforeach ?>#>
- />
- <# rendered = true;
- } #>
</del><ins>+ <# } #>
+ <?php foreach ( $video_types as $type ):
+ ?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) { #>
</ins><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php echo strtoupper( $type ) ?></span>
</span><del>- <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{{ data.model.<?php echo $type ?> }}}" />
</del><ins>+ <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
</ins><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><span class="cx"> <?php endforeach ?>
</span><span class="cx"> </div>
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span><?php _e( 'Poster Image' ); ?></span>
</span><del>- <input type="text" data-setting="poster" value="{{{ data.model.poster }}}" />
</del><ins>+ <input type="text" data-setting="poster" value="{{ data.model.poster }}" />
</ins><span class="cx"> </label>
</span><span class="cx"> <div class="setting preload">
</span><span class="cx"> <span><?php _e( 'Preload' ); ?></span>
</span><span class="cx"> <div class="button-group button-large" data-setting="preload">
</span><del>- <button class="button" value="auto">
- <?php esc_attr_e( 'Auto' ); ?>
- </button>
- <button class="button" value="metadata">
- <?php esc_attr_e( 'Metadata' ); ?>
- </button>
- <button class="button active" value="none">
- <?php esc_attr_e( 'None' ); ?>
- </button>
</del><ins>+ <button class="button" value="auto"><?php _e( 'Auto' ); ?></button>
+ <button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
+ <button class="button active" value="none"><?php _e( 'None' ); ?></button>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27475 => 27476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-03-08 21:53:51 UTC (rev 27475)
+++ trunk/src/wp-includes/media.php 2014-03-09 01:00:53 UTC (rev 27476)
</span><span class="lines">@@ -2342,6 +2342,18 @@
</span><span class="cx"> 'size' => get_option( 'image_default_size' ), // empty default
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ $exts = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );
+ $mimes = get_allowed_mime_types();
+ $ext_mimes = array();
+ foreach ( $exts as $ext ) {
+ foreach ( $mimes as $ext_preg => $mime_match ) {
+ if ( preg_match( '#' . $ext . '#i', $ext_preg ) ) {
+ $ext_mimes[ $ext ] = $mime_match;
+ break;
+ }
+ }
+ }
+
</ins><span class="cx"> $settings = array(
</span><span class="cx"> 'tabs' => $tabs,
</span><span class="cx"> 'tabUrl' => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
</span><span class="lines">@@ -2354,7 +2366,8 @@
</span><span class="cx"> 'id' => 0,
</span><span class="cx"> ),
</span><span class="cx"> 'defaultProps' => $props,
</span><del>- 'embedExts' => array_merge( wp_get_audio_extensions(), wp_get_video_extensions() ),
</del><ins>+ 'embedExts' => $exts,
+ 'embedMimes' => $ext_mimes
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $post = null;
</span></span></pre>
</div>
</div>
</body>
</html>