<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19893] trunk/wp-admin/js/theme.dev.js: Infinite scroll for themes.php and theme-install.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19893">19893</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-02-09 21:40:46 +0000 (Thu, 09 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Infinite scroll for themes.php and theme-install.php. Bump per page limit for themes.php to 999. Props helenyhou, DH-Shredder. see <a href="http://core.trac.wordpress.org/ticket/19815">#19815</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (19892 => 19893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2012-02-09 21:04:36 UTC (rev 19892)
+++ trunk/wp-admin/js/theme.dev.js 2012-02-09 21:40:46 UTC (rev 19893)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> noMoreResults: false,
</span><span class="cx">
</span><span class="cx"> init : function() {
</span><del>- $( '.pagination-links' ).hide();
</del><ins>+ $('.pagination-links').hide();
</ins><span class="cx">
</span><span class="cx"> inputs.nonce = $('#_ajax_fetch_list_nonce').val();
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> // Handle Inputs from Query
</span><span class="cx"> inputs.search = inputs.queryArray['s'];
</span><span class="cx"> inputs.features = inputs.queryArray['features'];
</span><del>- inputs.startPage = parseInt( inputs.queryArray['paged'] );
</del><ins>+ inputs.startPage = parseInt( inputs.queryArray['paged'] );
</ins><span class="cx"> inputs.tab = inputs.queryArray['tab'];
</span><span class="cx"> inputs.type = inputs.queryArray['type'];
</span><span class="cx">
</span><span class="lines">@@ -86,17 +86,16 @@
</span><span class="cx"> else
</span><span class="cx"> inputs.startPage++;
</span><span class="cx">
</span><del>- // FIXME: Debug Features Array
- // console.log("Features:" + inputs.features);
-
- // Link to output and start polling
</del><ins>+ // Cache jQuery objects
</ins><span class="cx"> inputs.outList = $('#availablethemes');
</span><ins>+ inputs.waiting = $('div.tablenav.bottom').children( 'img.ajax-loading' );
+ inputs.window = $(window);
</ins><span class="cx">
</span><span class="cx"> // Generate Query
</span><span class="cx"> wpThemes.query = new Query();
</span><span class="cx">
</span><span class="cx"> // Start Polling
</span><del>- $(window).scroll( function(){ wpThemes.maybeLoad(); });
</del><ins>+ inputs.window.scroll( function(){ wpThemes.maybeLoad(); } );
</ins><span class="cx"> },
</span><span class="cx"> delayedCallback : function( func, delay ) {
</span><span class="cx"> var timeoutTriggered, funcTriggered, funcArgs, funcContext;
</span><span class="lines">@@ -137,21 +136,14 @@
</span><span class="cx"> ( results.rows.indexOf( "no-items" ) != -1 ) ) {
</span><span class="cx"> this.noMoreResults = true;
</span><span class="cx"> } else {
</span><del>- inputs.outList.append(results.rows);
</del><ins>+ inputs.outList.append( results.rows );
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> maybeLoad: function() {
</span><span class="cx"> var self = this,
</span><span class="cx"> el = $(document),
</span><del>- bottom = el.scrollTop() + $(window).innerHeight();
-
- /* // FIXME: Debug scroll trigger.
- console.log('scrollTop:'+ el.scrollTop() +
- '; scrollBottom:' + bottom +
- '; height:' + el.height() +
- '; checkVal:' + (el.height() - wpThemes.outListBottomThreshold));
- */
-
</del><ins>+ bottom = el.scrollTop() + inputs.window.innerHeight();
+
</ins><span class="cx"> if ( this.noMoreResults ||
</span><span class="cx"> !this.query.ready() ||
</span><span class="cx"> ( bottom < inputs.outList.height() - wpThemes.outListBottomThreshold ) )
</span><span class="lines">@@ -159,18 +151,15 @@
</span><span class="cx">
</span><span class="cx"> setTimeout( function() {
</span><span class="cx"> var newTop = el.scrollTop(),
</span><del>- newBottom = newTop + $(window).innerHeight();
</del><ins>+ newBottom = newTop + inputs.window.innerHeight();
</ins><span class="cx">
</span><span class="cx"> if ( !self.query.ready() ||
</span><span class="cx"> ( newBottom < inputs.outList.height() - wpThemes.outListBottomThreshold ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- /* 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();
</del><ins>+ inputs.waiting.css( 'visibility', 'visible' ); // Show Spinner
+ self.ajax( function() { inputs.waiting.css( 'visibility', 'hidden' ) } ); // Hide Spinner
+
</ins><span class="cx"> }, wpThemes.timeToTriggerQuery );
</span><span class="cx"> },
</span><span class="cx"> parseQuery: function( query ) {
</span><span class="lines">@@ -213,13 +202,13 @@
</span><span class="cx"> var self = this,
</span><span class="cx"> query = {
</span><span class="cx"> action: 'fetch-list',
</span><ins>+ tab: inputs.tab,
</ins><span class="cx"> paged: this.page,
</span><span class="cx"> s: inputs.search,
</span><ins>+ type: inputs.type,
+ _ajax_fetch_list_nonce: inputs.nonce,
</ins><span class="cx"> 'features[]': inputs.features,
</span><del>- 'list_args': list_args,
- 'tab': inputs.tab,
- 'type': inputs.type,
- '_ajax_fetch_list_nonce': inputs.nonce
</del><ins>+ 'list_args': list_args
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this.querying = true;
</span></span></pre>
</div>
</div>
</body>
</html>