Changeset 12181

Timestamp:

07/06/2018 07:20:21 PM (8 years ago)

Author:

r-a-y

Message:

Legacy: Fix activity stream's "Load More" button.

In the bp-legacy template pack, the "Load More" button used to be tied to
the bp-activity-oldestpage cookie. In v3.0, we made steps to remove
this cookie, but this broke activity pagination when used via AJAX (see

This commit outright removes dependencies on the bp-activity-oldestpage
cookie and uses a local variable to track the current activity pagination
number.

Props boonebgorges.

Fixes #7896 (3.x branch).

File:

• branches/3.0/src/bp-templates/bp-legacy/js/buddypress.js (modified) (5 diffs)

branches/3.0/src/bp-templates/bp-legacy/js/buddypress.js

@@ -12 +12 @@
 
 jq(document).ready( function() {
+        var activity_oldestpage = 1;
+
         /**** Page Load Actions *******************************************************/
 
@@ -258 +260 @@
                 }
 
-                /* Reset the page */
-                jq.cookie( 'bp-activity-oldestpage', 1, {
-                        path: '/',
-                        secure: ( 'https:' === window.location.protocol )
-                } );
-
                 /* Activity Stream Tabs */
                 scope  = target.attr('id').substr( 9, target.attr('id').length );
@@ -439 +435 @@
                         jq('#buddypress li.load-more').addClass('loading');
 
-                        if ( ! jq.cookie('bp-activity-oldestpage') ) {
-                                jq.cookie('bp-activity-oldestpage', 1, {
-                                        path: '/',
-                                        secure: ( 'https:' === window.location.protocol )
-                                } );
-                        }
-
-                        oldest_page = ( jq.cookie('bp-activity-oldestpage') * 1 ) + 1;
+                        oldest_page = activity_oldestpage + 1;
                         just_posted = [];
 
@@ -470 +459 @@
                         {
                                 jq('#buddypress li.load-more').removeClass('loading');
-                                jq.cookie( 'bp-activity-oldestpage', oldest_page, {
-                                        path: '/',
-                                        secure: ( 'https:' === window.location.protocol )
-                                } );
+                                activity_oldestpage = oldest_page;
                                 jq('#buddypress ul.activity-list').append(response.contents);
 
@@ -1858 +1844 @@
                 } );
         }
-        jq.cookie( 'bp-activity-oldestpage', 1, {
-                path: '/',
-                secure: ( 'https:' === window.location.protocol )
-        } );
 
         /* Remove selected and loading classes from tabs */