Changeset 30508

Timestamp:

11/21/2014 05:30:00 PM (7 years ago)

Author:

johnbillion

Message:

Abstract the theme browser route paths into attributes so they can be easily overridden.

Fixes #30116
Props matveb

File:

• trunk/src/wp-admin/js/theme.js (modified) (8 diffs)

trunk/src/wp-admin/js/theme.js

@@ -764 +764 @@
         this.$el.html( this.html( data ) );
 
-        themes.router.navigate( themes.router.baseUrl( '?theme=' + this.model.get( 'id' ) ), { replace: true } );
+        themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ), { replace: true } );
 
         this.$el.fadeIn( 200, function() {
@@ -997 +997 @@
 
         // Trigger a route update for the current model
-        themes.router.navigate( themes.router.baseUrl( '?theme=' + this.model.id ) );
+        themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.id ) );
 
         // Sets this.view to 'detail'
@@ -1133 +1133 @@
         // Update the URL hash
         if ( event.target.value ) {
-            themes.router.navigate( themes.router.baseUrl( '?search=' + event.target.value ), options );
+            themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + event.target.value ), options );
         } else {
             themes.router.navigate( themes.router.baseUrl( '' ) );
@@ -1143 +1143 @@
 
         if ( event.target.value ) {
-            url = themes.router.baseUrl( '?search=' + event.target.value );
+            url = themes.router.baseUrl( themes.router.searchPath + event.target.value );
         }
 
@@ -1167 +1167 @@
         return 'themes.php' + url;
     },
+
+    themePath: '?theme=',
+    searchPath: '?search=',
 
     search: function( query ) {
@@ -1297 +1300 @@
 
         // Set route
-        themes.router.navigate( themes.router.baseUrl( '?search=' + value ), { replace: true } );
+        themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + value ), { replace: true } );
     }, 300 )
 });
@@ -1396 +1399 @@
 
         // Trigger a router.naviagte update
-        themes.router.navigate( themes.router.baseUrl( '?browse=' + sort ) );
+        themes.router.navigate( themes.router.baseUrl( themes.router.browsePath + sort ) );
     },
 
@@ -1568 +1571 @@
         return 'theme-install.php' + url;
     },
+
+    themePath: '?theme=',
+    browsePath: '?browse=',
+    searchPath: '?search=',
 
     search: function( query ) {