Changeset 39099

Timestamp:

11/02/2016 10:46:25 PM (7 years ago)

Author:

swissspidy

Message:

Plugins: Improve Ajax search of installed plugins.

Removes the highlight from the current filter when performing an Ajax search and adds it back when clearing the search input.

Fixes #37657.

File:

• trunk/src/wp-admin/js/updates.js (modified) (4 diffs)

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

@@ -2246 +2246 @@
         $pluginSearch.on( 'keyup input', _.debounce( function( event ) {
             var data = {
-                _ajax_nonce: wp.updates.ajaxNonce,
-                s:           event.target.value,
-                pagenow:     pagenow
-            };
+                _ajax_nonce:   wp.updates.ajaxNonce,
+                s:             event.target.value,
+                pagenow:       pagenow,
+                plugin_status: 'all'
+            },
+            queryArgs;
 
             // Clear on escape.
@@ -2262 +2264 @@
             }
 
+            queryArgs = _.object( _.compact( _.map( location.search.slice( 1 ).split( '&' ), function( item ) {
+                if ( item ) return item.split( '=' );
+            } ) ) );
+
+            data.plugin_status = queryArgs.plugin_status || 'all';
+
             if ( window.history && window.history.replaceState ) {
-                window.history.replaceState( null, '', location.href.split( '?' )[ 0 ] + '?s=' + data.s );
+                window.history.replaceState( null, '', location.href.split( '?' )[ 0 ] + '?s=' + data.s + '&plugin_status=' + data.plugin_status );
             }
 
@@ -2272 +2280 @@
             $bulkActionForm.empty();
             $( 'body' ).addClass( 'loading-content' );
+            $( '.subsubsub .current' ).removeClass( 'current' );
 
             wp.updates.searchRequest = wp.ajax.post( 'search-plugins', data ).done( function( response ) {
@@ -2281 +2290 @@
                 if ( ! data.s.length ) {
                     $oldSubTitle.remove();
+                    $( '.subsubsub .' + data.plugin_status + ' a' ).addClass( 'current' );
                 } else if ( $oldSubTitle.length ) {
                     $oldSubTitle.replaceWith( $subTitle );