Changeset 1297

Timestamp:

02/24/2015 05:19:35 AM (10 years ago)

Author:

obenland

Message:

WP.org Themes: Improve index guessing for tags and search index pages.

See #850.

File:

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

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

@@ -468 +468 @@
         collapse: function( event ) {
             var self = this,
-                scroll, sorter;
+                scroll, search, tags, sorter;
 
             event = event || window.event;
@@ -495 +495 @@
                     scroll = document.body.scrollTop;
 
-                    sorter = $( '.filter-links .current' );
-
                     // Clean the url structure
-                    wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.browsePath + sorter.data( 'sort' ) ) );
-                    wp.themes.utils.title( sorter.text() );
+                    if ( search = $( '#wp-filter-search-input' ).val() ) {
+                        wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.searchPath + search ) );
+                        wp.themes.utils.title( search );
+                    }
+                    else if ( tags = wp.themes.view.Installer.prototype.filtersChecked() ) {
+                        wp.themes.router.navigate( wp.themes.router.baseUrl( 'tag/' + tags.join( '+' ) ) );
+                        wp.themes.utils.title( _.each( tags, function( tag, i ) {
+                            tags[ i ] = $( 'label[for="filter-id-' + tag + '"]' ).text();
+                        }).join( ', ' ) );
+                    }
+                    else if ( sorter = $( '.filter-links .current' ) ) {
+                        wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.browsePath + sorter.data( 'sort' ) ) );
+                        wp.themes.utils.title( sorter.text() );
+                    }
 
                     // Restore scroll position
@@ -603 +613 @@
                 wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.searchPath + value ), { replace: true } );
             } else {
-                wp.themes.router.navigate( wp.themes.router.baseUrl( themes.router.browsePath + sort ) );
+                wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.browsePath + sort ) );
                 this.parent.sort( sort );
             }