Changeset 19893

Timestamp:

02/09/2012 09:40:46 PM (13 years ago)

Author:

ryan

Message:

Infinite scroll for themes.php and theme-install.php. Bump per page limit for themes.php to 999. Props helenyhou, DH-Shredder. see #19815

File:

• trunk/wp-admin/js/theme.dev.js (modified) (9 diffs)

trunk/wp-admin/js/theme.dev.js

@@ -67 +67 @@
         
         init : function() {
-            $( '.pagination-links' ).hide();
+            $('.pagination-links').hide();
 
             inputs.nonce = $('#_ajax_fetch_list_nonce').val();
@@ -78 +78 @@
             inputs.search = inputs.queryArray['s'];
             inputs.features = inputs.queryArray['features'];
-            inputs.startPage = parseInt( inputs.queryArray['paged'] );
+            inputs.startPage = parseInt( inputs.queryArray['paged'] );  
             inputs.tab = inputs.queryArray['tab'];
             inputs.type = inputs.queryArray['type'];
@@ -87 +87 @@
                 inputs.startPage++;
 
-            // FIXME: Debug Features Array
-            // console.log("Features:" + inputs.features);
-
-            // Link to output and start polling
+            // Cache jQuery objects
             inputs.outList = $('#availablethemes');
+            inputs.waiting = $('div.tablenav.bottom').children( 'img.ajax-loading' );
+            inputs.window = $(window);
 
             // Generate Query
@@ -97 +96 @@
 
             // Start Polling
-            $(window).scroll( function(){ wpThemes.maybeLoad(); });
+            inputs.window.scroll( function(){ wpThemes.maybeLoad(); } );
         },
         delayedCallback : function( func, delay ) {
@@ -138 +137 @@
                 this.noMoreResults = true;
             } else {
-                inputs.outList.append(results.rows);
+                inputs.outList.append( results.rows );
             }
         },
@@ -144 +143 @@
             var self = this,
                 el = $(document),
-                bottom = el.scrollTop() + $(window).innerHeight();
-
-            /* // FIXME: Debug scroll trigger.
-            console.log('scrollTop:'+ el.scrollTop() + 
-                '; scrollBottom:' + bottom +
-                '; height:' + el.height() +
-                '; checkVal:' + (el.height() - wpThemes.outListBottomThreshold));
-            */
-
+                bottom = el.scrollTop() + inputs.window.innerHeight();
+                
             if ( this.noMoreResults ||
                  !this.query.ready() || 
@@ -160 +152 @@
             setTimeout( function() {
                 var newTop = el.scrollTop(),
-                    newBottom = newTop + $(window).innerHeight();
+                    newBottom = newTop + inputs.window.innerHeight();
 
                 if ( !self.query.ready() ||
@@ -166 +158 @@
                     return;
 
-                /* FIXME: Create/Add Spinner.
-                self.waiting.show(); // Show Spinner
-                el.scrollTop( newTop + self.waiting.outerHeight() ); // Scroll down?
-                self.ajax( function() { self.waiting.hide(); }); // Hide Spinner
-                */
-                self.ajax();
+                inputs.waiting.css( 'visibility', 'visible' ); // Show Spinner
+                self.ajax( function() { inputs.waiting.css( 'visibility', 'hidden' ) } ); // Hide Spinner
+                
             }, wpThemes.timeToTriggerQuery );
         },
@@ -214 +203 @@
             query = {
                 action: 'fetch-list',
+                tab: inputs.tab,
                 paged: this.page,
                 s: inputs.search,
+                type: inputs.type,
+                _ajax_fetch_list_nonce: inputs.nonce,
                 'features[]': inputs.features,
-                'list_args': list_args,
-                'tab': inputs.tab,
-                'type': inputs.type,
-                '_ajax_fetch_list_nonce': inputs.nonce
+                'list_args': list_args
             };