Changeset 7116

Timestamp:

05/28/2013 02:42:15 AM (12 years ago)

Author:

boonebgorges

Message:

Exclude dynamically added activity items when clicking Load More in directory

This prevents duplicate items appearing after Load More due to the numeric
offset caused by AJAX-inserted activity items.

Fixes #4897

Props imath

Location:

trunk

Files:

• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
• bp-templates/bp-legacy/js/buddypress.js (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (2 diffs)

trunk/bp-templates/bp-legacy/buddypress-functions.php

@@ -417 +417 @@
     if ( ! empty( $_POST['page'] ) && '-1' != $_POST['page'] )
         $qs[] = 'page=' . absint( $_POST['page'] );
+
+    // exludes activity just posted and avoids duplicate ids
+    if ( ! empty( $_POST['exclude_just_posted'] ) ) {
+        $just_posted = wp_parse_id_list( $_POST['exclude_just_posted'] );
+        $qs[] = 'exclude=' . implode( ',', $just_posted );
+    }
 
     $object_search_text = bp_get_search_default_text( $object );

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

@@ -117 +117 @@
 
                 jq("#activity-stream").prepend(response);
-                jq("#activity-stream li:first").addClass('new-update');
+                jq("#activity-stream li:first").addClass('new-update just-posted');
 
                 if ( 0 != jq("#latest-update").length ) {
@@ -319 +319 @@
             var oldest_page = ( jq.cookie('bp-activity-oldestpage') * 1 ) + 1;
 
+            var just_posted = [];
+            
+            jq('.activity-list li.just-posted').each( function(){
+                just_posted.push( jq(this).attr('id').replace( 'activity-','' ) );
+            });
+
             jq.post( ajaxurl, {
                 action: 'activity_get_older_updates',
                 'cookie': bp_get_cookies(),
-                'page': oldest_page
+                'page': oldest_page,
+                'exclude_just_posted': just_posted.join(',')
             },
             function(response)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -126 +126 @@
     if ( ! empty( $_POST['page'] ) && '-1' != $_POST['page'] )
         $qs[] = 'page=' . absint( $_POST['page'] );
+
+    // exludes activity just posted and avoids duplicate ids
+    if ( ! empty( $_POST['exclude_just_posted'] ) ) {
+        $just_posted = wp_parse_id_list( $_POST['exclude_just_posted'] );
+        $qs[] = 'exclude=' . implode( ',', $just_posted );
+    }
 
     $object_search_text = bp_get_search_default_text( $object );

trunk/bp-themes/bp-default/_inc/global.js

@@ -117 +117 @@
 
                 jq("ul#activity-stream").prepend(response);
-                jq("ul#activity-stream li:first").addClass('new-update');
+                jq("ul#activity-stream li:first").addClass('new-update just-posted');
 
                 if ( 0 != jq("#latest-update").length ) {
@@ -316 +316 @@
             var oldest_page = ( jq.cookie('bp-activity-oldestpage') * 1 ) + 1;
 
+            var just_posted = [];
+            
+            jq('.activity-list li.just-posted').each( function(){
+                just_posted.push( jq(this).attr('id').replace( 'activity-','' ) );
+            });
+
             jq.post( ajaxurl, {
                 action: 'activity_get_older_updates',
                 'cookie': bp_get_cookies(),
-                'page': oldest_page
+                'page': oldest_page,
+                'exclude_just_posted': just_posted.join(',')
             },
             function(response)