Changeset 16022

Timestamp:

10/27/2010 08:17:00 PM (14 years ago)

Author:

scribu

Message:

Set additional fields when searching. Fixes #15211

Location:

trunk

Files:

• wp-admin/js/list-table.dev.js (modified) (2 diffs)
• wp-includes/js/jquery/jquery.serialize-object.js (added)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/js/list-table.dev.js

@@ -36 +36 @@
 
         this.update_rows({'paged': paged});
-    },
-
-    // searching
-    change_search: function(s) {
-        this.update_rows({'s': s}, true, function() {
-            $('h2 .subtitle').remove();
-
-            if ( s )
-                $('h2').eq(0).append($('<span class="subtitle">').html(listTableL10n.search.replace('%s', this.htmlencode(s))));
-        });
     },
 
@@ -217 +207 @@
 
     // searchbox
-    $('.search-box :submit').click(function() {
-        listTable.change_search($(this).parent('.search-box').find(':text').val());
-
-        return false;
-    });
-
-    $('.search-box :text').keypress(function(e) {
-        if ( 13 != e.keyCode )
+    function change_search(ev) {
+        if ( 'keypress' == ev.type && 13 != e.keyCode )
             return;
 
-        listTable.change_search($(this).val());
-
-        return false;
-    });
+        ev.preventDefault();
+        ev.stopImmediatePropagation();
+
+        var data = $(this).parent('.search-box').find(':input').serializeObject();
+
+        listTable.update_rows(data, true, function() {
+            $('h2 .subtitle').remove();
+
+            if ( data.s )
+                $('h2').append($('<span class="subtitle">').html(
+                    listTableL10n.search.replace('%s', this.htmlencode(data.s))
+                ));
+        });
+    }
+    $('.search-box :submit').click(change_search);
+    $('.search-box :text').keypress(change_search);
 
     // tablenav dropdowns

trunk/wp-includes/script-loader.php

@@ -171 +171 @@
     $scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7' );
     $scripts->add_data( 'jquery-query', 'group', 1 );
+
+    $scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2' );
+    $scripts->add_data( 'jquery-serialize-object', 'group', 1 );
 
     $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m' );
@@ -355 +358 @@
         $scripts->add_data( 'theme-preview', 'group', 1 );
 
-        $scripts->add( 'list-table', "/wp-admin/js/list-table$suffix.js", array( 'jquery', 'jquery-query' ), '20101023' );
+        $scripts->add( 'list-table', "/wp-admin/js/list-table$suffix.js", array( 'jquery-query', 'jquery-serialize-object' ), '20101027' );
         $scripts->add_data( 'list-table', 'group', 1 );
         $scripts->localize( 'list-table', 'listTableL10n', array(