Ticket #26543: 26543-theme-js.diff

wp-admin/js/theme.js

@@ -645 +645 @@
 // Listens to [theme] and [search] params
 themes.routes = Backbone.Router.extend({
 
-        initialize: function() {
-                this.routes = _.object([
-                ]);
+        routes: {
+                'themes.php?theme=:slug': 'theme',
+                'themes.php?search=:query': 'search',
+                'themes.php?s=:query': 'search'
         },
 
         baseUrl: function( url ) {
-                return themes.data.settings.root + url;
+                return 'themes.php' + url;
+        },
+
+        search: function( query ) {
+                $( '.theme-search' ).val( query );
         }
 });
 
@@ -675 +680 @@
                 this.view.render();
                 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 } ) );
-                }
-
-                // Set the initial search
-                if ( 'undefined' !== typeof themes.data.settings.search && '' !== themes.data.settings.search ){
-                        $( '.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 });
-                }
+                // Sets up Backbone.history
+                Backbone.history.start({ root: themes.data.settings.root.replace( 'themes.php', '' ), pushState: true, queryUri: 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 );
+                });
         }
 };