<!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>[22021] trunk: Media JS: Add support for filtering Attachment collections by mime type.</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, #logmsg > ol { margin-left: 0; 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/22021">22021</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-26 20:50:13 +0000 (Wed, 26 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media JS: Add support for filtering Attachment collections by mime type. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21776">#21776</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (22020 => 22021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-09-26 20:05:12 UTC (rev 22020)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-09-26 20:50:13 UTC (rev 22021)
</span><span class="lines">@@ -1802,7 +1802,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_ajax_query_attachments() {
</span><span class="cx"> $query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
</span><del>- $query = array_intersect_key( $query, array_flip( array( 's', 'order', 'orderby', 'posts_per_page', 'paged' ) ) );
</del><ins>+ $query = array_intersect_key( $query, array_flip( array( 's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type' ) ) );
</ins><span class="cx">
</span><span class="cx"> $query['post_type'] = 'attachment';
</span><span class="cx"> $query['post_status'] = 'inherit';
</span></span></pre></div>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22020 => 22021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-09-26 20:05:12 UTC (rev 22020)
+++ trunk/wp-includes/js/media-models.js 2012-09-26 20:50:13 UTC (rev 22021)
</span><span class="lines">@@ -224,6 +224,7 @@
</span><span class="cx"> this.props.on( 'change:orderby', this._changeOrderby, this );
</span><span class="cx"> this.props.on( 'change:query', this._changeQuery, this );
</span><span class="cx"> this.props.on( 'change:search', this._changeSearch, this );
</span><ins>+ this.props.on( 'change:type', this._changeType, this );
</ins><span class="cx">
</span><span class="cx"> // Set the `props` model and fill the default property values.
</span><span class="cx"> this.props.set( _.defaults( options.props || {}, {
</span><span class="lines">@@ -264,15 +265,15 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _changeSearch: function( model, term ) {
</del><ins>+ _changeFilteredProp: function( prop, model, term ) {
</ins><span class="cx"> // Bail if we're currently searching for the same term.
</span><del>- if ( this.props.get('search') === term )
</del><ins>+ if ( this.props.get( prop ) === term )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( term && ! this.filters.search )
- this.filters.search = Attachments.filters.search;
- else if ( ! term && this.filters.search === Attachments.filters.search )
- delete this.filters.search;
</del><ins>+ if ( term && ! this.filters[ prop ] )
+ this.filters[ prop ] = Attachments.filters[ prop ];
+ else if ( ! term && this.filters[ prop ] === Attachments.filters[ prop ] )
+ delete this.filters[ prop ];
</ins><span class="cx">
</span><span class="cx"> // If no `Attachments` model is provided to source the searches
</span><span class="cx"> // from, then automatically generate a source from the existing
</span><span class="lines">@@ -283,6 +284,14 @@
</span><span class="cx"> this.reset( this.props.get('source').filter( this.validator ) );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _changeSearch: function( model, term ) {
+ return this._changeFilteredProp( 'search', model, term );
+ },
+
+ _changeType: function( model, term ) {
+ return this._changeFilteredProp( 'type', model, term );
+ },
+
</ins><span class="cx"> validator: function( attachment ) {
</span><span class="cx"> return _.all( this.filters, function( filter, key ) {
</span><span class="cx"> return !! filter.call( this, attachment );
</span><span class="lines">@@ -380,6 +389,14 @@
</span><span class="cx"> var value = attachment.get( key );
</span><span class="cx"> return value && -1 !== value.search( this.props.get('search') );
</span><span class="cx"> }, this );
</span><ins>+ },
+
+ type: function( attachment ) {
+ var type = this.props.get('type');
+ if ( ! type )
+ return true;
+
+ return -1 !== type.indexOf( attachment.get('type') );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -497,7 +514,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> propmap: {
</span><del>- 'search': 's'
</del><ins>+ 'search': 's',
+ 'type': 'post_mime_type'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Caches query objects so queries can be easily reused.
</span></span></pre>
</div>
</div>
</body>
</html>