Changeset 28019

Timestamp:

04/07/2014 10:14:01 PM (10 years ago)

Author:

helen

Message:

Only show the media library loading spinner if we're scrolled toward the bottom. Prevents the spinner from flashing a second time when first loading the library due to a second query firing after initial load.

props kovshenin. fixes #24859.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (1 diff)

trunk/src/wp-includes/js/media-views.js

@@ -4889 +4889 @@
         scroll: function() {
             var view = this,
-                toolbar;
-
-            // @todo: is this still necessary?
-            if ( ! this.$el.is(':visible') ) {
+                toolbar = this.views.parent.toolbar;
+
+            // @todo: is :visible still necessary?
+            if ( ! this.$el.is(':visible') || ! this.collection.hasMore() ) {
                 return;
             }
 
-            if ( this.collection.hasMore() && this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) {
-                toolbar = this.views.parent.toolbar;
+            // 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 ) {
                 toolbar.get('spinner').show();
-
+            }
+
+            if ( this.el.scrollHeight < this.el.scrollTop + ( this.el.clientHeight * this.options.refreshThreshold ) ) {
                 this.collection.more().done(function() {
                     view.scroll();