<!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>[29104] trunk/src: Media Grid, for audio files:</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/29104">29104</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-11 20:54:13 +0000 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid, for audio files:
* Show `artist` and `album` fields in the Edit Attachment modal
* Sync their values on `change`
See <a href="http://core.trac.wordpress.org/ticket/28839">#28839</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (29103 => 29104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-07-11 20:26:55 UTC (rev 29103)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-07-11 20:54:13 UTC (rev 29104)
</span><span class="lines">@@ -2218,6 +2218,25 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 0 === strpos( $post['post_mime_type'], 'audio/' ) ) {
+ $changed = false;
+ $id3data = wp_get_attachment_metadata( $post['ID'] );
+ if ( ! is_array( $id3data ) ) {
+ $changed = true;
+ $id3data = array();
+ }
+ foreach ( wp_get_attachment_id3_keys( (object) $post, 'edit' ) as $key => $label ) {
+ if ( isset( $changes[ $key ] ) ) {
+ $changed = true;
+ $id3data[ $key ] = sanitize_text_field( wp_unslash( $changes[ $key ] ) );
+ }
+ }
+
+ if ( $changed ) {
+ wp_update_attachment_metadata( $id, $id3data );
+ }
+ }
+
</ins><span class="cx"> wp_update_post( $post );
</span><span class="cx"> wp_send_json_success();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29103 => 29104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-11 20:26:55 UTC (rev 29103)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-11 20:54:13 UTC (rev 29104)
</span><span class="lines">@@ -298,10 +298,11 @@
</span><span class="cx">
</span><span class="cx"> this.$el.attr('aria-label', this.model.get( 'title' ) ).attr( 'aria-checked', false );
</span><span class="cx">
</span><del>- this.model.on( 'change:sizes change:uploading', this.render, this );
- this.model.on( 'change:title', this._syncTitle, this );
</del><ins>+ this.model.on( 'change:title', this._syncTitle, this );
</ins><span class="cx"> this.model.on( 'change:caption', this._syncCaption, this );
</span><span class="cx"> this.model.on( 'change:percent', this.progress, this );
</span><ins>+ this.model.on( 'change:album', this._syncAlbum, this );
+ this.model.on( 'change:artist', this._syncArtist, this );
</ins><span class="cx">
</span><span class="cx"> // Update the selection.
</span><span class="cx"> this.model.on( 'add', this.select, this );
</span><span class="lines">@@ -443,6 +444,7 @@
</span><span class="cx">
</span><span class="cx"> this.on( 'content:render:edit-metadata', this.editMetadataContent, this );
</span><span class="cx"> this.on( 'content:render:edit-image', this.editImageContentUgh, this );
</span><ins>+ this.on( 'close', this.detach );
</ins><span class="cx">
</span><span class="cx"> // Only need a tab to Edit Image for images.
</span><span class="cx"> if ( 'undefined' !== typeof this.model && this.model.get( 'type' ) === 'image' ) {
</span><span class="lines">@@ -465,12 +467,12 @@
</span><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> // Completely destroy the modal DOM element when closing it.
</span><del>- this.modal.close = function() {
</del><ins>+ this.modal.on( 'close', function() {
</ins><span class="cx"> self.modal.remove();
</span><span class="cx"> $( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
</span><span class="cx">
</span><span class="cx"> self.resetRoute();
</span><del>- };
</del><ins>+ } );
</ins><span class="cx">
</span><span class="cx"> this.modal.content( this );
</span><span class="cx"> this.modal.open();
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29103 => 29104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-11 20:26:55 UTC (rev 29103)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-11 20:54:13 UTC (rev 29104)
</span><span class="lines">@@ -5032,7 +5032,9 @@
</span><span class="cx"> // Ensure settings remain in sync between attachment views.
</span><span class="cx"> _.each({
</span><span class="cx"> caption: '_syncCaption',
</span><del>- title: '_syncTitle'
</del><ins>+ title: '_syncTitle',
+ artist: '_syncArtist',
+ album: '_syncAlbum'
</ins><span class="cx"> }, function( method, setting ) {
</span><span class="cx"> /**
</span><span class="cx"> * @param {Backbone.Model} model
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29103 => 29104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-11 20:26:55 UTC (rev 29103)
+++ trunk/src/wp-includes/media-template.php 2014-07-11 20:54:13 UTC (rev 29104)
</span><span class="lines">@@ -337,6 +337,17 @@
</span><span class="cx"> <span class="name"><?php _e('Title'); ?></span>
</span><span class="cx"> <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
</span><span class="cx"> </label>
</span><ins>+ <# if ( 'audio' === data.type ) { #>
+ <?php foreach ( array(
+ 'artist' => __( 'Artist' ),
+ 'album' => __( 'Album' ),
+ ) as $key => $label ) : ?>
+ <label class="setting" data-setting="<?php echo esc_attr( $key ) ?>">
+ <span class="name"><?php echo $label ?></span>
+ <input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" />
+ </label>
+ <?php endforeach; ?>
+ <# } #>
</ins><span class="cx"> <label class="setting" data-setting="caption">
</span><span class="cx"> <span class="name"><?php _e('Caption'); ?></span>
</span><span class="cx"> <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
</span><span class="lines">@@ -352,15 +363,16 @@
</span><span class="cx"> <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
</span><span class="cx"> </label>
</span><span class="cx"> <label class="setting">
</span><del>- <span class="name"><?php _e( 'Uploaded By' ); ?></span>
- <span class="value">{{ data.authorName }}</span>
- </label>
</del><ins>+ <span class="name"><?php _e( 'Uploaded By' ); ?></span>
+ <span class="value">{{ data.authorName }}</span>
+ </label>
</ins><span class="cx"> <# if ( data.uploadedTo ) { #>
</span><span class="cx"> <label class="setting">
</span><span class="cx"> <span class="name"><?php _e('Uploaded To'); ?></span>
</span><span class="cx"> <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
</span><span class="cx"> </label>
</span><span class="cx"> <# } #>
</span><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>