Changeset 10379

Timestamp:

11/25/2015 09:27:19 PM (9 years ago)

Author:

r-a-y

Message:

JS: Fix an issue with parsing the page number when clicking on a pagination link.

Previously, when a paginated link is clicked, we grabbed the page number
from the URL. This isn't great as the URL is unreliable to parse the page
number (see #6189).

This commit partially reverts r7946 to use the older page number parsing,
but with some logic to properly parse numbers.

See #6745 (trunk).

Anti-props r-a-y.

File:

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

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

@@ -946 +946 @@
             el,
             css_id, object, search_terms, pagination_id, template,
-            url_parameters, page_number,
+            page_number,
             $gm_search,
             caller;
@@ -971 +971 @@
             template = null;
 
-            url_parameters = target.attr('href').split( '&' );
-            // The page number is the first parameter.
-            page_number = url_parameters[0].split( '=' );
-            page_number = page_number[1];
-
             // Search terms
             if ( jq('div.dir-search input').length ) {
@@ -985 +980 @@
                     search_terms = search_terms.val();
                 }
+            }
+
+            // Page number
+            if ( jq(target).hasClass('next') || jq(target).hasClass('prev') ) {
+                page_number = jq('.pagination span.current').html();
+            } else {
+                page_number = jq(target).html();
+            }
+
+            // Remove any non-numeric characters from page number text (commas, etc.)
+            page_number = Number( page_number.replace(/\D/g,'') );
+
+            if ( jq(target).hasClass('next') ) {
+                page_number++;
+            } else if ( jq(target).hasClass('prev') ) {
+                page_number--;
             }