Changeset 13344
- Timestamp:
- 10/25/2022 07:33:13 PM (2 years ago)
- Location:
- trunk/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-template.php
r13326 r13344 273 273 'secondary_id' => false, // Secondary object ID to filter on e.g. a post_id. 274 274 'offset' => false, // Return only items >= this ID. 275 'offset_lower' => false, // Return only items < this ID. 275 276 'since' => false, // Return only items recorded since this Y-m-d H:i:s date. 276 277 … … 327 328 'object' => $_GET['afilter'] 328 329 ); 329 } elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r[' since'] ) ) {330 } elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r['offset_lower'] ) || ! empty( $r['since'] ) ) { 330 331 $r['filter'] = array( 331 332 'user_id' => $r['user_id'], … … 335 336 'secondary_id' => $r['secondary_id'], 336 337 'offset' => $r['offset'], 338 'offset_lower' => $r['offset_lower'], 337 339 'since' => $r['since'] 338 340 ); … … 411 413 global $activities_template; 412 414 413 $url = bp_get_requested_url(); 414 $link = add_query_arg( $activities_template->pag_arg, $activities_template->pag_page + 1, $url ); 415 $url = bp_get_requested_url(); 416 $load_more_args = array( 417 $activities_template->pag_arg => $activities_template->pag_page + 1, 418 ); 419 420 // Try to include the offset arg. 421 $last_displayed_activity = reset( $activities_template->activities ); 422 if ( isset( $last_displayed_activity->id ) && $last_displayed_activity->id ) { 423 $load_more_args['offset_lower'] = (int) $last_displayed_activity->id; 424 } 425 426 $link = add_query_arg( $load_more_args, $url ); 415 427 416 428 /** -
trunk/src/bp-activity/classes/class-bp-activity-activity.php
r13337 r13344 1923 1923 * @type int $offset Return only those items with an ID greater 1924 1924 * than the offset value. 1925 * @type int $offset_lower Return only those items with an ID lower 1926 * than the offset value. 1925 1927 * @type string $since Return only those items that have a 1926 1928 * date_recorded value greater than a … … 1966 1968 $sid_sql = absint( $filter_array['offset'] ); 1967 1969 $filter_sql[] = "a.id >= {$sid_sql}"; 1970 } 1971 1972 if ( ! empty( $filter_array['offset_lower'] ) ) { 1973 $sid_sql = absint( $filter_array['offset_lower'] ); 1974 $filter_sql[] = "a.id < {$sid_sql}"; 1968 1975 } 1969 1976 -
trunk/src/bp-templates/bp-legacy/buddypress-functions.php
r13306 r13344 766 766 } 767 767 768 if ( ! empty( $_POST['offset_lower'] ) ) { 769 $qs[] = 'offset_lower=' . intval( $_POST['offset_lower'] ); 770 } 771 768 772 $object_search_text = bp_get_search_default_text( $object ); 769 773 if ( ! empty( $_POST['search_terms'] ) && is_string( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] ) -
trunk/src/bp-templates/bp-legacy/js/buddypress.js
r13190 r13344 432 432 /* Load more updates at the end of the page */ 433 433 if ( target.parent().hasClass('load-more') ) { 434 var loadMoreLink = new URL( jq( target ).prop( 'href' ) ), 435 offsetLower = parseInt( loadMoreLink.searchParams.get( 'offset_lower' ), 10 ) || 0; 436 434 437 if ( bp_ajax_request ) { 435 438 bp_ajax_request.abort(); … … 449 452 'cookie': bp_get_cookies(), 450 453 'page': oldest_page, 454 'offset_lower': offsetLower, 451 455 'exclude_just_posted': just_posted.join(',') 452 456 }; -
trunk/src/bp-templates/bp-nouveau/includes/functions.php
r13312 r13344 116 116 if ( ! empty( $post_query['offset'] ) ) { 117 117 $qs[] = 'offset=' . intval( $post_query['offset'] ); 118 } 119 120 if ( ! empty( $post_query['offset_lower'] ) ) { 121 $qs[] = 'offset_lower=' . intval( $post_query['offset_lower'] ); 118 122 } 119 123 -
trunk/src/bp-templates/bp-nouveau/js/buddypress-activity.js
r13114 r13344 274 274 // Load more activities 275 275 } else if ( $( event.currentTarget ).hasClass( 'load-more' ) ) { 276 var next_page = ( Number( this.current_page ) * 1 ) + 1, self = this, search_terms = ''; 276 var next_page = ( Number( this.current_page ) * 1 ) + 1, self = this, search_terms = '', 277 loadMoreLink = $( event.currentTarget ).children().first(), 278 offsetLower = loadMoreLink ? bp.Nouveau.getLinkParams( loadMoreLink.prop( 'href' ), 'offset_lower' ) : 0; 277 279 278 280 // Stop event propagation 279 281 event.preventDefault(); 280 282 281 $( event.currentTarget ).find( 'a' ).first().addClass( 'loading' );283 loadMoreLink.addClass( 'loading' ); 282 284 283 285 // reset the just posted … … 301 303 method : 'append', 302 304 exclude_just_posted : this.just_posted.join( ',' ), 305 offset_lower : offsetLower, 303 306 target : '#buddypress [data-bp-list] ul.bp-list' 304 307 } ).done( function( response ) {
Note: See TracChangeset
for help on using the changeset viewer.