Changeset 20242

Timestamp:

03/21/2012 08:17:47 PM (13 years ago)

Author:

nacin

Message:

Tidy up sanity checks in theme.dev.js. props DH-Shredder, fixes #19815.

File:

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

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

@@ -106 +106 @@
 (function($){
     ThemeScroller = {
-        nonce: '',
-        nextPage: 2, // By default, assume we're on the first page.
         querying: false,
         scrollPollingDelay: 500,
@@ -120 +118 @@
          */
         init: function() {
-            var self = this,
-                startPage;
+            var self = this;
 
             // Get out early if we don't have the required arguments.
@@ -133 +130 @@
             // Handle inputs
             this.nonce = $('#_ajax_fetch_list_nonce').val();
-
-            startPage = theme_list_args.paged;
-            if ( startPage !== undefined )
-                this.nextPage = ( startPage + 1 );
+            this.nextPage = ( theme_list_args.paged + 1 );
 
             // Cache jQuery selectors
@@ -148 +142 @@
              * when user hits the bottom of the current page
              */
-            if ( theme_list_args.total_pages !== undefined &&
-                 theme_list_args.total_pages >= this.nextPage )
+            if ( theme_list_args.total_pages >= this.nextPage )
                 this.pollInterval =
                     setInterval( function() {
@@ -182 +175 @@
          */
         process: function( results ) {
-            if ( ( results === undefined ) ||
-                 ( results.rows === undefined ) ||
-                 ( results.rows.indexOf( 'no-items' ) != -1 ) ) {
+            if ( results === undefined ) {
                 clearInterval( this.pollInterval );
                 return;