sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve race conditions in Attachments.more(). Provides for smoother refreshes when searching and properly cleans out content components.

Browse Source 
Props koopersmith
fixes #22656


git-svn-id: https://develop.svn.wordpress.org/trunk@22956 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2012-11-30 16:41:38 +00:00
parent b80e435481
commit 303f2bd2ff
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wp-includes/js/media-models.js
View File

@ -490,9 +490,27 @@ window.wp = window.wp || {};
}, },
more: function( options ) { more: function( options ) {
if ( this.mirroring && this.mirroring.more ) var deferred = $.Deferred(),
return this.mirroring.more( options ); mirroring = this.mirroring,
return $.Deferred().resolve().promise(); 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();
},
hasMore: function() {
return this.mirroring ? this.mirroring.hasMore() : false;
}, },
parse: function( resp, xhr ) { parse: function( resp, xhr ) {
@ -584,7 +602,7 @@ window.wp = window.wp || {};
Attachments.prototype.initialize.apply( this, arguments ); Attachments.prototype.initialize.apply( this, arguments );
this.args = options.args; this.args = options.args;
this.hasMore = true; this._hasMore = true;
this.created = new Date(); this.created = new Date();
this.filters.order = function( attachment ) { this.filters.order = function( attachment ) {
@ -627,21 +645,25 @@ window.wp = window.wp || {};
this.observe( wp.Uploader.queue ); this.observe( wp.Uploader.queue );
}, },
hasMore: function() {
return this._hasMore;
},
more: function( options ) { more: function( options ) {
var query = this; var query = this;
if ( this._more && 'pending' === this._more.state() ) if ( this._more && 'pending' === this._more.state() )
return this._more; return this._more;
if ( ! this.hasMore ) if ( ! this.hasMore() )
return $.Deferred().resolve().promise(); return $.Deferred().resolveWith( this ).promise();
options = options || {}; options = options || {};
options.add = true; options.add = true;
return this._more = this.fetch( options ).done( function( resp ) { return this._more = this.fetch( options ).done( function( resp ) {
if ( _.isEmpty( resp ) || -1 === this.args.posts_per_page || resp.length < this.args.posts_per_page ) if ( _.isEmpty( resp ) || -1 === this.args.posts_per_page || resp.length < this.args.posts_per_page )
query.hasMore = false; query._hasMore = false;
}); });
}, },

2
wp-includes/js/media-views.js
View File

@ -2821,7 +2821,7 @@
if ( ! this.$el.is(':visible') ) if ( ! this.$el.is(':visible') )
return; return;
if ( this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) { if ( this.collection.hasMore() && this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) {
this.collection.more().done( this.scroll ); this.collection.more().done( this.scroll );
} }
} }