Changeset 1375

Timestamp:

03/04/2015 12:02:15 PM (8 years ago)

Author:

obenland

Message:

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.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes

Files:

• functions.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• js/theme.js (modified) (3 diffs)
• style.css (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php

@@ -49 +49 @@
         wp_localize_script( 'theme', '_wpThemeSettings', array(
             'themes'   => false,
+            'query'    => wporg_themes_prepare_themes_for_js(),
             'settings' => array(
                 'title'      => __( 'WordPress › %s « Free WordPress Themes', 'wporg-themes' ),
@@ -110 +111 @@
 }
 add_filter( 'wp_title', 'wporg_themes_wp_title', 10, 2 );
+
+/**
+ * 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,
+    );
+ }
 
 /**

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/index.php

@@ -63 +63 @@
 
         <div class="theme-browser content-filterable">
-            <div class="themes" style="display:none;">
+            <div class="themes">
                 <?php
                     while ( have_posts() ) :

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js

@@ -644 +644 @@
         routes: {
             'browse/:sort/'  : 'sort',
-            'tags/:tag/'      : 'tag',
+            'tags/:tag/'     : 'tag',
             'search/:query/' : 'search',
             'author/:author/': 'author',
@@ -665 +665 @@
 
     _.extend( wp.themes.RunInstaller, {
-        extraRoutes: function() {
+        routes: function() {
             var self = this,
-            request = {};
-
-            // Open the modal when matching the route for a single themes.
+                request = {};
+
+            // 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
             wp.themes.router.on( 'route:preview', function( slug ) {
+                self.view.collection.queries.push( wp.themes.data.query );
+
+                request.theme = slug;
+                self.view.collection.query( request );
+
                 $( '.close-full-overlay' ).trigger( 'click' );
-                this.listenToOnce( self.view.collection, 'query:success', function() {
-                    self.view.view.expand( slug );
-                });
+                self.view.view.expand( slug );
+            });
+
+            // 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' );
             });
 
             wp.themes.router.on( 'route:tag', function( tag ) {
+                self.view.collection.queries.push( wp.themes.data.query );
+
                 _.each( tag.split( '+' ), function( tag ) {
                     $( '#filter-id-' + tag ).prop( 'checked', true );
@@ -686 +716 @@
 
             wp.themes.router.on( 'route:author', function( author ) {
+                self.view.collection.queries.push( wp.themes.data.query );
+
                 request.author = author;
                 self.view.collection.query( request );
                 wp.themes.utils.title( author );
             });
+
+            this.extraRoutes();
         }
     });

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/style.css

@@ -271 +271 @@
  * Theme heading information
  */
+.single.single-repopackage .themes .theme-wrap {
+    visibility: hidden;
+}
 .single .theme-wrap .current-label {
     background: #333;