Changeset 2031

Timestamp:

10/05/2009 06:03:50 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1145

Location:

trunk/bp-themes/bp-sn-parent/_inc

Files:

• ajax.php (modified) (4 diffs)
• js/ajax.js (modified) (7 diffs)

trunk/bp-themes/bp-sn-parent/_inc/ajax.php

@@ -11 +11 @@
 
 function bp_dtheme_ajax_directory_blogs() {
-    global $bp;
-
     check_ajax_referer('directory_blogs');
 
-    locate_template( array( 'directories/blogs/blogs-loop.php' ), true );
+    locate_template( array( '/directories/blogs/blogs-loop.php' ), true );
 }
 add_action( 'wp_ajax_directory_blogs', 'bp_dtheme_ajax_directory_blogs' );
@@ -22 +20 @@
     check_ajax_referer('directory_members');
 
-    locate_template( array( 'directories/members/members-loop.php' ), true );
+    locate_template( array( '/directories/members/members-loop.php' ), true );
 }
 add_action( 'wp_ajax_directory_members', 'bp_dtheme_ajax_directory_members' );
 
-function bp_dtheme_ajax_friends_search() {
-    global $bp;
-
-    check_ajax_referer( 'friends_search' );
-
-    locate_template( array( 'directories/friends/friends-loop.php' ), true );
-}
-add_action( 'wp_ajax_friends_search', 'bp_dtheme_ajax_friends_search' );
+function bp_dtheme_ajax_directory_groups() {
+    check_ajax_referer('directory_groups');
+
+    locate_template( array( 'directories/groups/groups-loop.php' ), true );
+}
+add_action( 'wp_ajax_directory_groups', 'bp_dtheme_ajax_directory_groups' );
 
 function bp_dtheme_ajax_addremove_friend() {
@@ -63 +59 @@
 }
 add_action( 'wp_ajax_addremove_friend', 'bp_dtheme_ajax_addremove_friend' );
+
+function bp_dtheme_ajax_my_friends() {
+    locate_template( array( 'friends/friends-loop.php' ), true );   
+}
+add_action( 'wp_ajax_my_friends_search', 'bp_dtheme_ajax_my_friends' );
 
 function bp_dtheme_ajax_invite_user() {
@@ -202 +203 @@
 }
 add_action( 'wp_ajax_get_group_members_admin', 'bp_dtheme_ajax_member_admin_list' );
-
-function bp_dtheme_ajax_directory_groups() {
-    global $bp;
-
-    check_ajax_referer('directory_groups');
-
-    locate_template( array( 'directories/groups/groups-loop.php' ), true );
-}
-add_action( 'wp_ajax_directory_groups', 'bp_dtheme_ajax_directory_groups' );
 
 function bp_dtheme_ajax_joinleave_group() {

trunk/bp-themes/bp-sn-parent/_inc/js/ajax.js

@@ -202 +202 @@
     );
 
-    j("div#pag a").livequery('click',
+    j(".friends div#pag a").livequery('click',
         function() { 
             j('.ajax-loader').toggle();
@@ -208 +208 @@
             var frpage = j(this).attr('href');
             frpage = frpage.split('=');
-
-            j.post( ajaxurl, {
-                action: 'friends_search',
+            
+            j.post( ajaxurl, {
+                action: 'my_friends_search',
                 'cookie': encodeURIComponent(document.cookie),
                 '_wpnonce': j("input#_wpnonce_friend_search").val(),
-                'initiator_id': j("input#initiator").val(),
                 'frpage': frpage[1],
 
@@ -236 +235 @@
     
     j("input#friend-search-box").keyup(
-
         function(e) {
             if ( e.which == 13 ) {
@@ -242 +240 @@
                 
                 j.post( ajaxurl, {
-                    action: 'friends_search',
+                    action: 'my_friends_search',
                     'cookie': encodeURIComponent(document.cookie),
                     '_wpnonce': j("input#_wpnonce_friend_search").val(),
-
+    
                     'friend-search-box': j("#friend-search-box").val()
                 },
                 function(response)
-                {
+                {   
                     response = response.substr( 0, response.length - 1 );
-
+    
                     j("div#friends-loop").fadeOut(200, 
                         function() {
@@ -259 +257 @@
                         }
                     );
-                    
                 });
-
+                
                 return false;
             }
@@ -406 +403 @@
     );
 
-    j("form#group-search-form").submit(
+    j("form#group-search-form, form#friend-search-form").submit(
         function() {
             return false;
@@ -475 +472 @@
     );
     
-    j("div#pag a").livequery('click',
+    j(".groups div#pag a").livequery('click',
         function() { 
             j('.ajax-loader').toggle();