Changeset 1435

Timestamp:

03/20/2015 04:08:38 AM (9 years ago)

Author:

obenland

Message:

WP.org Themes: Simplify app and remove some dead code.

See r1434.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js (modified) (8 diffs)

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

@@ -573 +573 @@
     });
 
-// Theme Details view
-// Set ups a modal overlay with the expanded theme data
+    // Theme Details view
+    // Set ups a modal overlay with the expanded theme data
     themes.view.Details = wp.Backbone.View.extend({
         // Wrap theme data on a div.theme element
@@ -1298 +1298 @@
 
         events: {
-            'input':  'search',
             'keyup':  'search',
-            'change': 'search',
-            'search': 'search',
-            'blur':   'pushState'
+            'search': 'search'
         },
 
@@ -1313 +1310 @@
             } );
 
-        },
-
-        // Runs a search on the theme collection.
-        search: function( event ) {
-            var options = {};
-
-            // Clear on escape.
-            if ( event.type === 'keyup' && event.which === 27 ) {
-                event.target.value = '';
-            }
-
-            // Lose input focus when pressing enter
-            if ( event.which === 13 ) {
-                this.$el.trigger( 'blur' );
-            }
-
-            this.collection.doSearch( event.target.value );
-
-            // if search is initiated and key is not return
-            if ( this.searching && event.which !== 13 ) {
-                options.replace = true;
-            } else {
-                this.searching = true;
-            }
-
-            // Update the URL hash
-            if ( event.target.value ) {
-                themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + event.target.value ), options );
-            } else {
-                themes.router.navigate( themes.router.baseUrl( '' ) );
-            }
-        },
-
-        pushState: function( event ) {
-            var url = themes.router.baseUrl( '' );
-
-            if ( event.target.value ) {
-                url = themes.router.baseUrl( themes.router.searchPath + event.target.value );
-            }
-
-            this.searching = false;
-            themes.router.navigate( url );
-
-        }
-    });
-
-    // Sets up the routes events for relevant url queries
-    // Listens to [theme] and [search] params
-    themes.Router = Backbone.Router.extend({
-
-        routes: {
-            'themes.php?theme=:slug': 'theme',
-            'themes.php?search=:query': 'search',
-            'themes.php?s=:query': 'search',
-            'themes.php': 'themes',
-            '': 'themes'
-        },
-
-        baseUrl: function( url ) {
-            return 'themes.php' + url;
-        },
-
-        themePath: '?theme=',
-        searchPath: '?search=',
-
-        search: function( query ) {
-            $( '.wp-filter-search' ).val( query );
-        },
-
-        themes: function() {
-            $( '.wp-filter-search' ).val( '' );
-        },
-
-        navigate: function() {
-            if ( Backbone.history._hasPushState ) {
-                Backbone.Router.prototype.navigate.apply( this, arguments );
-            }
-        }
-
-    });
-
-    // Extend the main Search view
-    themes.view.InstallerSearch =  themes.view.Search.extend({
-
-        events: {
-            'keyup':  'search',
-            'search': 'search'
         },
 
@@ -1720 +1630 @@
     });
 
-    themes.InstallerRouter = Backbone.Router.extend({
+    themes.Router = Backbone.Router.extend({
         routes: {
             'browse/:sort/'  : 'sort',
@@ -1753 +1663 @@
     });
 
-    themes.RunInstaller = {
+    themes.Run = {
         init: function() {
             // Set up the view
@@ -1759 +1669 @@
             this.view = new themes.view.Installer({
                 section: 'featured',
-                SearchView: themes.view.InstallerSearch
+                SearchView: themes.view.Search
             });
 
@@ -1785 +1695 @@
             // Bind to our global `themes` object
             // so that the router is available to sub-views
-            themes.router = new themes.InstallerRouter();
+            themes.router = new themes.Router();
 
             // Handles `theme` route event
@@ -1841 +1751 @@
     // Ready...
     $( function() {
-        themes.RunInstaller.init();
+        themes.Run.init();
     });