<!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>[22956] trunk/wp-includes/js: Resolve race conditions in Attachments.more().</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/22956">22956</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-30 16:41:38 +0000 (Fri, 30 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Resolve race conditions in Attachments.more(). Provides for smoother refreshes when searching and properly cleans out content components.
Props koopersmith
fixes <a href="http://core.trac.wordpress.org/ticket/22656">#22656</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.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 (22955 => 22956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-11-30 15:54:16 UTC (rev 22955)
+++ trunk/wp-includes/js/media-models.js 2012-11-30 16:41:38 UTC (rev 22956)
</span><span class="lines">@@ -490,11 +490,29 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> more: function( options ) {
</span><del>- if ( this.mirroring && this.mirroring.more )
- return this.mirroring.more( options );
- return $.Deferred().resolve().promise();
</del><ins>+ var deferred = $.Deferred(),
+ mirroring = this.mirroring,
+ attachments = this;
+
+ if ( ! mirroring || ! mirroring.more )
+ return deferred.resolveWith( this ).promise();
+
+ // If we're mirroring another collection, forward `more` to
+ // the mirrored collection. Account for a race condition by
+ // checking if we're still mirroring that collection when
+ // the request resolves.
+ mirroring.more( options ).done( function() {
+ if ( this === attachments.mirroring )
+ deferred.resolveWith( this );
+ });
+
+ return deferred.promise();
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ hasMore: function() {
+ return this.mirroring ? this.mirroring.hasMore() : false;
+ },
+
</ins><span class="cx"> parse: function( resp, xhr ) {
</span><span class="cx"> return _.map( resp, function( attrs ) {
</span><span class="cx"> var attachment = Attachment.get( attrs.id );
</span><span class="lines">@@ -583,9 +601,9 @@
</span><span class="cx"> options = options || {};
</span><span class="cx"> Attachments.prototype.initialize.apply( this, arguments );
</span><span class="cx">
</span><del>- this.args = options.args;
- this.hasMore = true;
- this.created = new Date();
</del><ins>+ this.args = options.args;
+ this._hasMore = true;
+ this.created = new Date();
</ins><span class="cx">
</span><span class="cx"> this.filters.order = function( attachment ) {
</span><span class="cx"> var orderby = this.props.get('orderby'),
</span><span class="lines">@@ -627,21 +645,25 @@
</span><span class="cx"> this.observe( wp.Uploader.queue );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ hasMore: function() {
+ return this._hasMore;
+ },
+
</ins><span class="cx"> more: function( options ) {
</span><span class="cx"> var query = this;
</span><span class="cx">
</span><span class="cx"> if ( this._more && 'pending' === this._more.state() )
</span><span class="cx"> return this._more;
</span><span class="cx">
</span><del>- if ( ! this.hasMore )
- return $.Deferred().resolve().promise();
</del><ins>+ if ( ! this.hasMore() )
+ return $.Deferred().resolveWith( this ).promise();
</ins><span class="cx">
</span><span class="cx"> options = options || {};
</span><span class="cx"> options.add = true;
</span><span class="cx">
</span><span class="cx"> return this._more = this.fetch( options ).done( function( resp ) {
</span><span class="cx"> if ( _.isEmpty( resp ) || -1 === this.args.posts_per_page || resp.length < this.args.posts_per_page )
</span><del>- query.hasMore = false;
</del><ins>+ query._hasMore = false;
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22955 => 22956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-30 15:54:16 UTC (rev 22955)
+++ trunk/wp-includes/js/media-views.js 2012-11-30 16:41:38 UTC (rev 22956)
</span><span class="lines">@@ -2821,7 +2821,7 @@
</span><span class="cx"> if ( ! this.$el.is(':visible') )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) {
</del><ins>+ if ( this.collection.hasMore() && this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) {
</ins><span class="cx"> this.collection.more().done( this.scroll );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>