<!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>[21900] trunk/wp-includes/js/media-models.js: Ensure the Attachments model properties are correctly set for Query collections.</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/21900">21900</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-18 22:19:05 +0000 (Tue, 18 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure the Attachments model properties are correctly set for Query collections.
After shifting sorting and searching logic from the `Query` collection in <a href="http://core.trac.wordpress.org/changeset/21898">[21898]</a>, it became apparent that `Query` collections should also have an accurate `props` model, as the model controls the aforementioned searching and sorting.
see <a href="http://core.trac.wordpress.org/ticket/21921">#21921</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</a>, and <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (21899 => 21900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-09-18 21:59:34 UTC (rev 21899)
+++ trunk/wp-includes/js/media-models.js 2012-09-18 22:19:05 UTC (rev 21900)
</span><span class="lines">@@ -440,15 +440,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }, {
</span><del>- defaultArgs: {
- posts_per_page: 40,
</del><ins>+ defaultProps: {
</ins><span class="cx"> orderby: 'date',
</span><span class="cx"> order: 'DESC'
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ defaultArgs: {
+ posts_per_page: 40
+ },
+
</ins><span class="cx"> orderby: {
</span><del>- allowed: [ 'name', 'author', 'date', 'title', 'modified', 'parent', 'ID' ],
- keymap: {
</del><ins>+ allowed: [ 'name', 'author', 'date', 'title', 'modified', 'uploadedTo', 'id' ],
+ valuemap: {
</ins><span class="cx"> 'id': 'ID',
</span><span class="cx"> 'uploadedTo': 'parent'
</span><span class="cx"> }
</span><span class="lines">@@ -465,39 +468,49 @@
</span><span class="cx"> return function( props, options ) {
</span><span class="cx"> var args = {},
</span><span class="cx"> orderby = Query.orderby,
</span><del>- defaults = Query.defaultArgs,
</del><ins>+ defaults = Query.defaultProps,
</ins><span class="cx"> query;
</span><span class="cx">
</span><ins>+ // Remove the `query` property. This isn't linked to a query,
+ // this *is* the query.
+ delete props.query;
+
+ // Fill default args.
+ _.defaults( props, defaults );
+
+ // Normalize the order.
+ props.order = props.order.toUpperCase();
+ if ( 'DESC' !== props.order && 'ASC' !== props.order )
+ props.order = defaults.order.toUpperCase();
+
+ // Ensure we have a valid orderby value.
+ if ( ! _.contains( orderby.allowed, props.orderby ) )
+ props.orderby = defaults.orderby;
+
+ // Generate the query `args` object.
</ins><span class="cx"> // Correct any differing property names.
</span><span class="cx"> _.each( props, function( value, prop ) {
</span><span class="cx"> args[ Query.propmap[ prop ] || prop ] = value;
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Fill default args.
- _.defaults( args, defaults );
</del><ins>+ // Fill any other default query args.
+ _.defaults( args, Query.defaultArgs );
</ins><span class="cx">
</span><del>- // Normalize the order.
- args.order = args.order.toUpperCase();
- if ( 'DESC' !== args.order && 'ASC' !== args.order )
- args.order = defaults.order.toUpperCase();
-
- // Set allowed orderby values.
- // These map directly to attachment keys in most scenarios.
</del><ins>+ // `props.orderby` does not always map directly to `args.orderby`.
</ins><span class="cx"> // Substitute exceptions specified in orderby.keymap.
</span><del>- args.orderby = orderby.keymap[ args.orderby ] || args.orderby;
</del><ins>+ args.orderby = orderby.valuemap[ props.orderby ] || props.orderby;
</ins><span class="cx">
</span><del>- // Ensure we have a valid orderby value.
- if ( ! _.contains( orderby.allowed, args.orderby ) )
- args.orderby = defaults.orderby;
-
- // Search the query cache.
</del><ins>+ // Search the query cache for matches.
</ins><span class="cx"> query = _.find( queries, function( query ) {
</span><span class="cx"> return _.isEqual( query.args, args );
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Otherwise, create a new query and add it to the cache.
</span><span class="cx"> if ( ! query ) {
</span><del>- query = new Query( [], _.extend( options || {}, { args: args } ) );
</del><ins>+ query = new Query( [], _.extend( options || {}, {
+ props: props,
+ args: args
+ } ) );
</ins><span class="cx"> queries.push( query );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>