<!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>[1375] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes: WP.org Themes: User server-side query results during bootstrapping.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1375">1375</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1375","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-04 12:02:15 +0000 (Wed, 04 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WP.org Themes: User server-side query results during bootstrapping.
This should avoid an extra API request on the initial load of a page.
H/t matveb.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesindexphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/index.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesjsthemejs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesstylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php 2015-03-04 03:28:36 UTC (rev 1374)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php 2015-03-04 12:02:15 UTC (rev 1375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,6 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'theme', '_wpThemeSettings', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'themes' => false,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'query' => wporg_themes_prepare_themes_for_js(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'WordPress › %s « Free WordPress Themes', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'isMobile' => wp_is_mobile(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,6 +112,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_title', 'wporg_themes_wp_title', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Bootstraps found themes for the frontend JS handler.
+ *
+ * @return array
+ */
+function wporg_themes_prepare_themes_for_js() {
+ global $wp_query;
+
+ include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
+ $api = new Themes_API( 'get_result' );
+ $api->fields = array_merge( $api->fields, array(
+ 'description' => true,
+ 'sections' => false,
+ 'tested' => true,
+ 'requires' => true,
+ 'rating' => true,
+ 'ratings' => true,
+ 'downloaded' => true,
+ 'downloadlink' => true,
+ 'last_updated' => true,
+ 'homepage' => true,
+ 'tags' => true,
+ 'num_ratings' => true,
+ 'parent' => true,
+ ) );
+
+ $themes = array_map( array( $api, 'fill_theme' ), $wp_query->posts );
+ $themes = array_map( 'wporg_themes_ajax_prepare_theme', $themes );
+
+ $request = array();
+ if ( get_query_var( 'browse' ) ) {
+ $request['browse'] = get_query_var( 'browse' );
+ } else if ( $wp_query->is_tag() ) {
+ $request['tag'] = (array) explode( '+', get_query_var( 'tag' ) );
+ }
+ else if ( $wp_query->is_search() ) {
+ $request['search'] = get_query_var( 's' );
+ }
+ else if ( $wp_query->is_author() ) {
+ $request['author'] = get_user_by( 'id', get_query_var( 'author' ) )->user_nicename;
+ }
+ else if ( $wp_query->is_singular( 'repopackage' ) ) {
+ $request['theme'] = get_query_var( 'name' );
+ }
+
+ return array(
+ 'themes' => $themes,
+ 'request' => $request,
+ 'total' => $wp_query->found_posts,
+ );
+ }
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $args
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $action
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/index.php 2015-03-04 03:28:36 UTC (rev 1374)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/index.php 2015-03-04 12:02:15 UTC (rev 1375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .wp-filter -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-browser content-filterable">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="themes" style="display:none;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="themes">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> while ( have_posts() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesjsthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js 2015-03-04 03:28:36 UTC (rev 1374)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js 2015-03-04 12:02:15 UTC (rev 1375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,7 +643,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( wp.themes.InstallerRouter.prototype, {
</span><span class="cx" style="display: block; padding: 0 10px"> routes: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'browse/:sort/' : 'sort',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'tags/:tag/' : 'tag',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'tags/:tag/' : 'tag',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search/:query/' : 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author/:author/': 'author',
</span><span class="cx" style="display: block; padding: 0 10px"> ':slug/preview/' : 'preview',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,19 +664,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( wp.themes.RunInstaller, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- extraRoutes: function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ routes: function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var self = this,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- request = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ request = {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Open the modal when matching the route for a single themes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bind to our global `wp.themes` object
+ // so that the router is available to sub-views
+ wp.themes.router = new wp.themes.InstallerRouter();
+
+ // Handles `theme` route event
+ // Queries the API for the passed theme slug
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.themes.router.on( 'route:preview', function( slug ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.view.collection.queries.push( wp.themes.data.query );
+
+ request.theme = slug;
+ self.view.collection.query( request );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.close-full-overlay' ).trigger( 'click' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.listenToOnce( self.view.collection, 'query:success', function() {
- self.view.view.expand( slug );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.view.view.expand( slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handles sorting / browsing routes
+ // Also handles the root URL triggering a sort request
+ // for `featured`, the default view
+ wp.themes.router.on( 'route:sort', function( sort ) {
+ self.view.collection.queries.push( wp.themes.data.query );
+
+ if ( ! sort ) {
+ sort = 'featured';
+ }
+ self.view.sort( sort );
+ self.view.trigger( 'theme:close' );
+ });
+
+ // The `search` route event. The router populates the input field.
+ wp.themes.router.on( 'route:search', function() {
+ self.view.collection.queries.push( wp.themes.data.query );
+
+ $( '.wp-filter-search' ).focus().trigger( 'keyup' );
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.themes.router.on( 'route:tag', function( tag ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.view.collection.queries.push( wp.themes.data.query );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _.each( tag.split( '+' ), function( tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#filter-id-' + tag ).prop( 'checked', true );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,10 +715,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.themes.router.on( 'route:author', function( author ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self.view.collection.queries.push( wp.themes.data.query );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> request.author = author;
</span><span class="cx" style="display: block; padding: 0 10px"> self.view.collection.query( request );
</span><span class="cx" style="display: block; padding: 0 10px"> wp.themes.utils.title( author );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ this.extraRoutes();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css 2015-03-04 03:28:36 UTC (rev 1374)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css 2015-03-04 12:02:15 UTC (rev 1375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,6 +270,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Theme heading information
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.single.single-repopackage .themes .theme-wrap {
+ visibility: hidden;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> .single .theme-wrap .current-label {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #333;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span></span></pre>
</div>
</div>
</body>
</html>