Changeset 9353

Timestamp:

01/13/2015 09:09:30 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Ajax search in private message inbox/sentbox has been broken since r9240. We fix it here by modifying the JS in bp-legacy to accommodate both DOM scenarios, and include the option of using button instead of input (which can likely happen in other areas over time, also.)

Props r-a-y, hnla. Fixes #6116.

File:

• trunk/src/bp-templates/bp-legacy/js/buddypress.js (modified) (2 diffs)

trunk/src/bp-templates/bp-legacy/js/buddypress.js

@@ -1358 +1358 @@
         /** Private Messaging ******************************************/
 
-        /** Message search*/
+        /** Message search */
         jq('.message-search').on( 'click', function(event) {
                 if ( jq(this).hasClass('no-ajax') ) {
@@ -1367 +1367 @@
                         object;
 
-                if ( target.attr('type') === 'submit' ) {
-                        //var css_id = jq('.item-list-tabs li.selected').attr('id').split( '-' );
+                if ( target.attr('type') === 'submit' || target.attr('type') === 'button' ) {
                         object = 'messages';
 
-                        bp_filter_request( object, jq.cookie('bp-' + object + '-filter'), jq.cookie('bp-' + object + '-scope') , 'div.' + object, target.parent().children('label').children('input').val(), 1, jq.cookie('bp-' + object + '-extras') );
+                        bp_filter_request(
+                                object,
+                                jq.cookie('bp-' + object + '-filter'),
+                                jq.cookie('bp-' + object + '-scope'),
+                                'div.' + object, jq('#messages_search').val(),
+                                1,
+                                jq.cookie('bp-' + object + '-extras')
+                        );
 
                         return false;