Ticket #25963: 25963.12.diff

wp-admin/js/theme.js

@@ -646 +646 @@
 themes.routes = Backbone.Router.extend({
 
         initialize: function() {
-                this.routes = _.object([
-                ]);
+                this.route( /^(.*?)/, 'parseThemeUri' );
         },
 
+        // Parse URL route
+        parseThemeUri: function() {
+                var regex = /([^&=]+)=?([^&]*)/g,
+                        params, key, value;
+
+                // Gets the url params from Backbone.history
+                params = regex.exec( Backbone.history.location.search );
+
+                // Bail if we have no parameters
+                if ( ! params ) {
+                        return;
+                }
+
+                key = params[1];
+                value = params[2]
+
+                // Handles theme route
+                if ( key.indexOf( 'theme' ) !== -1 ) {
+                        this.theme( value );
+                }
+
+                // Handles search route
+                if ( key.indexOf( 'search' ) !== -1 ) {
+                        this.search( value );
+                }
+        },
+
         baseUrl: function( url ) {
                 return themes.data.settings.root + url;
+        },
+
+        theme: function( slug ) {
+                // Trigger a route event of 'theme'
+                this.trigger( 'route:theme', slug );
+        },
+
+        search: function( term ) {
+                // Set the search input value based on url
+                $( '.theme-search' ).val( term );
+                // Trigger a route event of 'search'
+                this.trigger( 'route:search', term );
         }
 });
 
@@ -673 +711 @@
         render: function() {
                 // Render results
                 this.view.render();
+
+                // Calls the routes functionality
                 this.routes();
-
+/*
                 // Set the initial theme
                 if ( 'undefined' !== typeof themes.data.settings.theme && '' !== themes.data.settings.theme ){
                         this.view.view.theme.trigger( 'theme:expand', this.view.collection.findWhere( { id: themes.data.settings.theme } ) );
@@ -685 +725 @@
                         $( '.theme-search' ).val( themes.data.settings.search );
                         this.themes.doSearch( themes.data.settings.search );
                 }
-
+*/
                 // Start the router if browser supports History API
                 if ( window.history && window.history.pushState ) {
                         // Calls the routes functionality
-                        Backbone.history.start({ pushState: true, silent: true });
+                        Backbone.history.start({ pushState: true });
                 }
         },
 
         routes: function() {
+                var self = this;
                 // Bind to our global thx object
                 // so that the object is available to sub-views
                 themes.router = new themes.routes();
+
+                // Handles theme details route event
+                themes.router.on( 'route:theme', function( slug ) {
+                        self.view.view.expand( slug );
+                });
+
+                // Handles search route event
+                themes.router.on( 'route:search', function( query ) {
+                        self.themes.doSearch( query );
+                });
         }
 };
 

wp-admin/themes.php

@@ -100 +100 @@
                 'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
                 'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
                 'root'          => parse_url( admin_url( 'themes.php' ), PHP_URL_PATH ),
-                'theme'         => esc_html( $theme ),
-                'search'        => esc_html( $search ),
-
         ),
-        'l10n' => array(
-                'addNew' => __( 'Add New Theme' ),
-                'search'  => __( 'Search Installed Themes' ),
-                'searchPlaceholder' => __( 'Search installed themes...' ),
-        ),
+        'l10n' => array(
+                'addNew' => __( 'Add New Theme' ),
+                'search' => __( 'Search Installed Themes' ),
+                'searchPlaceholder' => __( 'Search installed themes...' ),
+        ),
 ) );
 
 add_thickbox();
@@ -279 +276 @@
         <# } #>
         <span class="more-details"><?php _e( 'Theme Details' ); ?></span>
         <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
-        
+
         <# if ( data.active ) { #>
                 <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
         <# } else { #>