<!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>[27486] trunk/src/wp-includes/media.php: Playlists:</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/27486">27486</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-09 22:44:22 +0000 (Sun, 09 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Playlists:

* Add an action, `wp_playlist_scripts`, where a user can turn off all default script and style loading for playlists and roll their own.
* Move the script and style loading for playlists to a function, `wp_playlist_scripts( $type )`, that hooks into `wp_playlist_scripts`.
* Make the `<noscript>` playlist output an `<ol>`, instead of a list of links with no surrounding markup.

See <a href="http://core.trac.wordpress.org/ticket/26631">#26631</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27485 => 27486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php  2014-03-09 22:19:36 UTC (rev 27485)
+++ trunk/src/wp-includes/media.php     2014-03-09 22:44:22 UTC (rev 27486)
</span><span class="lines">@@ -999,6 +999,55 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Output and enqueue default scripts and styles for playlists.
+ *
+ * @since 3.9.0
+ *
+ * @param string $type Type of playlist: "audio" or "video."
+ */
+function wp_playlist_scripts( $type ) {
+       wp_enqueue_style( 'wp-mediaelement' );
+       wp_enqueue_script( 'wp-playlist' );
+?>
+<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ) ?>');</script><![endif]-->
+<script type="text/html" id="tmpl-wp-playlist-current-item">
+       <# if ( data.image ) { #>
+       <img src="{{{ data.thumb.src }}}"/>
+       <# } #>
+       <# if ( data.meta.title ) { #>
+       <div class="wp-playlist-caption">
+               <span class="wp-caption-meta wp-caption-title">&#8220;{{{ data.meta.title }}}&#8221;</span>
+               <span class="wp-caption-meta wp-caption-album">{{{ data.meta.album }}}</span>
+               <span class="wp-caption-meta wp-caption-artist">{{{ data.meta.artist }}}</span>
+       </div>
+       <# } else { #>
+       <div class="wp-playlist-caption">{{{ data.caption ? data.caption : data.title }}}</div>
+       <# } #>
+</script>
+<script type="text/html" id="tmpl-wp-playlist-item">
+       <div class="wp-playlist-item">
+               <# if ( ( data.title || data.meta.title ) && ( ! data.artists || data.meta.artist ) ) { #>
+               <div class="wp-playlist-caption">
+                       {{{ data.index ? ( data.index + '.&nbsp;' ) : '' }}}
+                       <span class="wp-caption-title">&#8220;{{{ data.title ? data.title : data.meta.title }}}&#8221;</span>
+                       <# if ( data.artists ) { #>
+                       <span class="wp-caption-by"><?php _e( 'by' ) ?></span>
+                       <span class="wp-caption-artist">{{{ data.meta.artist }}}</span>
+                       <# } #>
+               </div>
+               <# } else { #>
+               <div class="wp-playlist-caption">{{{ data.index ? ( data.index + '.' ) : '' }}} {{{ data.caption ? data.caption : data.title }}}</div>
+               <# } #>
+               <# if ( data.meta.length_formatted ) { #>
+               <div class="wp-playlist-item-length">{{{ data.meta.length_formatted }}}</div>
+               <# } #>
+       </div>
+</script>
+<?php
+}
+add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
+
+/**
</ins><span class="cx">  * The Playlist shortcode.
</span><span class="cx">  *
</span><span class="cx">  * This implements the functionality of the Playlist Shortcode for displaying
</span><span class="lines">@@ -1195,45 +1244,17 @@
</span><span class="cx"> 
</span><span class="cx">  ob_start();
</span><span class="cx"> 
</span><del>-       if ( 1 === $instance ):
-               wp_enqueue_style( 'wp-mediaelement' );
-               wp_enqueue_script( 'wp-playlist' );
-?>
-<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ) ?>');</script><![endif]-->
-<script type="text/html" id="tmpl-wp-playlist-current-item">
-       <# if ( data.image ) { #>
-       <img src="{{{ data.thumb.src }}}"/>
-       <# } #>
-       <# if ( data.meta.title ) { #>
-       <div class="wp-playlist-caption">
-               <span class="wp-caption-meta wp-caption-title">&#8220;{{{ data.meta.title }}}&#8221;</span>
-               <span class="wp-caption-meta wp-caption-album">{{{ data.meta.album }}}</span>
-               <span class="wp-caption-meta wp-caption-artist">{{{ data.meta.artist }}}</span>
-       </div>
-       <# } else { #>
-       <div class="wp-playlist-caption">{{{ data.caption ? data.caption : data.title }}}</div>
-       <# } #>
-</script>
-<script type="text/html" id="tmpl-wp-playlist-item">
-       <div class="wp-playlist-item">
-               <# if ( ( data.title || data.meta.title ) && ( ! data.artists || data.meta.artist ) ) { #>
-               <div class="wp-playlist-caption">
-                       {{{ data.index ? ( data.index + '.&nbsp;' ) : '' }}}
-                       <span class="wp-caption-title">&#8220;{{{ data.title ? data.title : data.meta.title }}}&#8221;</span>
-                       <# if ( data.artists ) { #>
-                       <span class="wp-caption-by"><?php _e( 'by' ) ?></span>
-                       <span class="wp-caption-artist">{{{ data.meta.artist }}}</span>
-                       <# } #>
-               </div>
-               <# } else { #>
-               <div class="wp-playlist-caption">{{{ data.index ? ( data.index + '.' ) : '' }}} {{{ data.caption ? data.caption : data.title }}}</div>
-               <# } #>
-               <# if ( data.meta.length_formatted ) { #>
-               <div class="wp-playlist-item-length">{{{ data.meta.length_formatted }}}</div>
-               <# } #>
-       </div>
-</script>
-       <?php endif ?>
</del><ins>+        if ( 1 === $instance ) {
+               /**
+                * Hook to print and enqueue playlist scripts, styles, and JavaScript templates.
+                *
+                * @since 3.9.0
+                *
+                * @param string $type   Type of playlist: "audio" or "video."
+                * @param string $style  The "theme" for the playlist. Core provides "light" and "dark."
+                */
+               do_action( 'wp_playlist_scripts', $type, $style );
+       } ?>
</ins><span class="cx"> <div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>">
</span><span class="cx">  <?php if ( 'audio' === $type ): ?>
</span><span class="cx">  <div class="wp-playlist-current-item"></div>
</span><span class="lines">@@ -1246,14 +1267,11 @@
</span><span class="cx">  <div class="wp-playlist-next"></div>
</span><span class="cx">  <div class="wp-playlist-prev"></div>
</span><span class="cx">  <noscript>
</span><del>-       <?php
-       $output = "\n";
</del><ins>+        <ol><?php
</ins><span class="cx">   foreach ( $attachments as $att_id => $attachment ) {
</span><del>-               $output .= wp_get_attachment_link( $att_id ) . "\n";
</del><ins>+                printf( '<li>%s</li>', wp_get_attachment_link( $att_id ) );
</ins><span class="cx">   }
</span><del>-
-       echo $output;
-       ?>
</del><ins>+        ?></ol>
</ins><span class="cx">   </noscript>
</span><span class="cx">  <script type="application/json"><?php echo json_encode( $data ) ?></script>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>

</body>
</html>