<!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>[27979] trunk/src/wp-includes: [27640] supported a caption for audio and video shortcodes as part of a UX iteration for the related MCE views.</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/27979">27979</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-04-07 06:12:06 +0000 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://core.trac.wordpress.org/changeset/27640">[27640]</a> supported a caption for audio and video shortcodes as part of a UX iteration for the related MCE views. These captions have since be excluded, so the extra code should be removed (it was there for this sole reason).
See <a href="http://core.trac.wordpress.org/ticket/27320">#27320</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</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="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (27978 => 27979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-04-07 01:09:38 UTC (rev 27978)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-04-07 06:12:06 UTC (rev 27979)
</span><span class="lines">@@ -204,7 +204,6 @@
</span><span class="cx"> loop : false,
</span><span class="cx"> autoplay : false,
</span><span class="cx"> preload : 'none',
</span><del>- caption : '',
</del><span class="cx"> width : 400
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -259,7 +258,6 @@
</span><span class="cx"> autoplay : false,
</span><span class="cx"> preload : 'metadata',
</span><span class="cx"> content : '',
</span><del>- caption : '',
</del><span class="cx"> width : 640,
</span><span class="cx"> height : 360
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (27978 => 27979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-04-07 01:09:38 UTC (rev 27978)
+++ trunk/src/wp-includes/js/media-editor.js 2014-04-07 06:12:06 UTC (rev 27979)
</span><span class="lines">@@ -202,23 +202,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! _.isEmpty( attachment.caption ) ) {
- shortcode.caption = attachment.caption;
- } else if ( attachment.meta && attachment.meta.title ) {
- shortcode.caption = '“' + attachment.meta.title + '”';
- if ( attachment.meta.album ) {
- shortcode.caption += ' from ' + attachment.meta.album;
- }
-
- if ( attachment.meta.artist ) {
- shortcode.caption += ' by ' + attachment.meta.artist;
- }
- } else if ( ! _.isEmpty( attachment.description ) ) {
- shortcode.caption = attachment.description;
- } else {
- shortcode.caption = attachment.title;
- }
-
</del><span class="cx"> extension = attachment.filename.split('.').pop();
</span><span class="cx">
</span><span class="cx"> if ( _.contains( wp.media.view.settings.embedExts, extension ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (27978 => 27979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-04-07 01:09:38 UTC (rev 27978)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-04-07 06:12:06 UTC (rev 27979)
</span><span class="lines">@@ -297,17 +297,6 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wpview-type-video .track-details,
-.wpview-type-audio .track-details {
- position: absolute;
- top: 0;
- left: 5px;
- width: 85%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
-}
-
</del><span class="cx"> .wpview-type-gallery:after {
</span><span class="cx"> content: '';
</span><span class="cx"> display: table;
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27978 => 27979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-04-07 01:09:38 UTC (rev 27978)
+++ trunk/src/wp-includes/media-template.php 2014-04-07 06:12:06 UTC (rev 27979)
</span><span class="lines">@@ -851,12 +851,6 @@
</span><span class="cx"> <span><?php _e( 'Loop' ); ?></span>
</span><span class="cx"> <input type="checkbox" data-setting="loop" />
</span><span class="cx"> </label>
</span><del>-
- <label class="setting">
- <span><?php _e( 'Caption' ); ?></span>
- <input type="text" data-setting="caption" value="{{ data.model.caption }}" />
- </label>
-
</del><span class="cx"> <div class="clear"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -968,11 +962,6 @@
</span><span class="cx"> <# } #>
</span><span class="cx"> <textarea class="hidden content-setting">{{ content }}</textarea>
</span><span class="cx"> </label>
</span><del>-
- <label class="setting">
- <span><?php _e( 'Caption' ); ?></span>
- <input type="text" data-setting="caption" value="{{ data.model.caption }}" />
- </label>
</del><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </script>
</span><span class="lines">@@ -1009,9 +998,6 @@
</span><span class="cx"> <div class="dashicons dashicons-edit edit"></div>
</span><span class="cx"> <div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><del>- <# if ( ! _.isEmpty( data.model.caption ) ) { #>
- <div class="track-details">{{ data.model.caption }}</div>
- <# } #>
</del><span class="cx"> <?php wp_underscore_audio_template() ?>
</span><span class="cx"> <div class="wpview-overlay"></div>
</span><span class="cx"> </script>
</span><span class="lines">@@ -1021,9 +1007,6 @@
</span><span class="cx"> <div class="dashicons dashicons-edit edit"></div>
</span><span class="cx"> <div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><del>- <# if ( ! _.isEmpty( data.model.caption ) ) { #>
- <div class="track-details">{{ data.model.caption }}</div>
- <# } #>
</del><span class="cx"> <?php wp_underscore_video_template() ?>
</span><span class="cx"> <div class="wpview-overlay"></div>
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27978 => 27979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-04-07 01:09:38 UTC (rev 27978)
+++ trunk/src/wp-includes/media.php 2014-04-07 06:12:06 UTC (rev 27979)
</span><span class="lines">@@ -1392,7 +1392,6 @@
</span><span class="cx">
</span><span class="cx"> $default_types = wp_get_audio_extensions();
</span><span class="cx"> $defaults_atts = array(
</span><del>- 'caption' => '',
</del><span class="cx"> 'src' => '',
</span><span class="cx"> 'loop' => '',
</span><span class="cx"> 'autoplay' => '',
</span><span class="lines">@@ -1552,7 +1551,6 @@
</span><span class="cx">
</span><span class="cx"> $default_types = wp_get_video_extensions();
</span><span class="cx"> $defaults_atts = array(
</span><del>- 'caption' => '',
</del><span class="cx"> 'src' => '',
</span><span class="cx"> 'poster' => '',
</span><span class="cx"> 'loop' => '',
</span></span></pre>
</div>
</div>
</body>
</html>