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

Media Grid: Improve lazy loading.

Browse Source 
props kovshenin.
see #24716.

git-svn-id: https://develop.svn.wordpress.org/trunk@29312 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2014-07-27 17:57:25 +00:00
parent ea34a0bdf7
commit 9f105673fb
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/js/media-grid.js
View File

@ -206,7 +206,9 @@
suggestedWidth: state.get('suggestedWidth'), suggestedWidth: state.get('suggestedWidth'),
suggestedHeight: state.get('suggestedHeight'), suggestedHeight: state.get('suggestedHeight'),
AttachmentView: state.get('AttachmentView') AttachmentView: state.get('AttachmentView'),
scrollElement: document
}); });
} }
}); });

25
src/wp-includes/js/media-views.js
View File

@ -5201,10 +5201,6 @@
cssTemplate: media.template('attachments-css'), cssTemplate: media.template('attachments-css'),
events: {
'scroll': 'scroll'
},
initialize: function() { initialize: function() {
this.el.id = _.uniqueId('__attachments-view-'); this.el.id = _.uniqueId('__attachments-view-');
@ -5235,9 +5231,12 @@
this.collection.on( 'reset', this.render, this ); this.collection.on( 'reset', this.render, this );
// Throttle the scroll handler. // Throttle the scroll handler and bind this.
this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value(); this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
this.options.scrollElement = this.options.scrollElement || this.el;
$( this.options.scrollElement ).on( 'scroll', this.scroll );
this.initSortable(); this.initSortable();
_.bindAll( this, 'css' ); _.bindAll( this, 'css' );
@ -5406,20 +5405,29 @@
scroll: function() { scroll: function() {
var view = this, var view = this,
el = this.options.scrollElement,
scrollTop = el.scrollTop,
toolbar; toolbar;
if ( ! this.$el.is(':visible') || ! this.collection.hasMore() ) { // The scroll event occurs on the document, but the element
// that should be checked is the document body.
if ( el == document ) {
el = document.body;
scrollTop = $(document).scrollTop();
}
if ( ! $(el).is(':visible') || ! this.collection.hasMore() ) {
return; return;
} }
toolbar = this.views.parent.toolbar; toolbar = this.views.parent.toolbar;
// Show the spinner only if we are close to the bottom. // Show the spinner only if we are close to the bottom.
if ( this.el.scrollHeight - ( this.el.scrollTop + this.el.clientHeight ) < this.el.clientHeight / 3 ) { if ( el.scrollHeight - ( scrollTop + el.clientHeight ) < el.clientHeight / 3 ) {
toolbar.get('spinner').show(); toolbar.get('spinner').show();
} }
if ( this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) { if ( el.scrollHeight < scrollTop + ( el.clientHeight * this.options.refreshThreshold ) ) {
this.collection.more().done(function() { this.collection.more().done(function() {
view.scroll(); view.scroll();
toolbar.get('spinner').hide(); toolbar.get('spinner').hide();
@ -5859,6 +5867,7 @@
selection: this.options.selection, selection: this.options.selection,
model: this.model, model: this.model,
sortable: this.options.sortable, sortable: this.options.sortable,
scrollElement: this.options.scrollElement,
// The single `Attachment` view to be used in the `Attachments` view. // The single `Attachment` view to be used in the `Attachments` view.
AttachmentView: this.options.AttachmentView AttachmentView: this.options.AttachmentView