← All changes | app/Elementor/Render/Render.php +27 -86 3.4.0 → 3.2.5 View file →

		@@ -125,14 +125,8 @@
125	125	if ( ! empty( $pagination_attributes ) ) {
126	126	$container_attributes['data-rtsb-ajax'] = $pagination_attributes;
127	127	}
128	128
129		- // Opt-out of the scroll-to-top behaviour on Ajax filter/pagination when
130		- // the "Enable Scroll To Top?" switch is turned off.
131		- if ( isset( $settings['enable_ajax_scroll'] ) && empty( $settings['enable_ajax_scroll'] ) ) {
132		- $container_attributes['data-rtsb-disable-scroll'] = '1';
133		- }
134		-
135	129	// Adding render attributes.
136	130	$this->add_attribute( 'rtsb_container_attr_' . $rand, $container_attributes );
137	131
138	132	// Start rendering.
		@@ -468,15 +462,11 @@
468	462	$settings['rtsb_order'] = in_array( $order, [ 'ASC','DESC' ], true ) ? $order : 'ASC';
469	463
470	464	$pagination = $metas['pagination'];
471	465
472		- $page_type = BuilderFns::builder_type( get_the_ID() );
473		- $is_preview = BuilderFns::is_builder_preview() && array_key_exists( $page_type, BuilderFns::builder_page_types() );
474		- $raw_settings = $widget->get_settings_for_display();
475		- $widget_per_page = ! empty( $raw_settings['posts_per_page'] ) ? absint( $raw_settings['posts_per_page'] ) : 0;
476		- $wc_per_page = wc_get_default_products_per_row() * wc_get_default_product_rows_per_page();
477		- $posts_per_page = $widget_per_page ? $widget_per_page : apply_filters( 'loop_shop_per_page', $wc_per_page ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- woocommerce default hooks used.
478		- $restore_query = false;
	466	+ $page_type = BuilderFns::builder_type( get_the_ID() );
	467	+ $is_preview = BuilderFns::is_builder_preview() && array_key_exists( $page_type, BuilderFns::builder_page_types() );
	468	+ $posts_per_page = apply_filters( 'loop_shop_per_page', wc_get_default_products_per_row() * wc_get_default_product_rows_per_page() ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- woocommerce default hooks used.
479	469	if ( $is_preview ) {
480	470	$main_query = clone $wp_query;
481	471	$main_post = clone $post;
482	472
		@@ -497,30 +487,12 @@
497	487	$wp_query = new WP_Query( $wp_query_args ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
498	488
499	489	wc_set_loop_prop( 'total', $wp_query->found_posts );
500	490	wc_set_loop_prop( 'total_pages', $wp_query->max_num_pages );
501		- } elseif ( ! is_admin() && ( is_shop() || is_product_taxonomy() ) && absint( $wp_query->get( 'posts_per_page' ) ) !== $posts_per_page ) {
502		- // Apply widget's posts_per_page to the main query on the live frontend.
503		- $main_query = clone $wp_query;
504		- $main_post = clone $post;
505		-
506		- $query_vars = $wp_query->query_vars;
507		- $query_vars['posts_per_page'] = $posts_per_page;
508		-
509		- $wp_query = new WP_Query( $query_vars ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
510		-
511		- wc_set_loop_prop( 'total', $wp_query->found_posts );
512		- wc_set_loop_prop( 'total_pages', $wp_query->max_num_pages );
513		-
514		- $restore_query = true;
515	491	}
516	492
517		- if ( rtsb()->has_pro() && ( Fns::product_has_applied_filters( 'shop' ) || Fns::product_has_applied_filters( 'archive' ) || 'rtsb_builder' === get_post_type( get_the_ID() ) ) ) {
518		- $rtsb_active_filters_html = Fns::get_active_filters_html();
519		- $rtsb_wrapper_style = '' !== $rtsb_active_filters_html ? ' style="' . esc_attr( 'display:block;' ) . '"' : '';
520		- echo '<div class="rtsb-active-filters-wrapper"' . $rtsb_wrapper_style . '>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Style value is escaped above.
521		- Fns::print_html( $rtsb_active_filters_html, true );
522		- echo '</div>';
	493	+ if ( Fns::product_has_applied_filters( 'shop' ) || Fns::product_has_applied_filters( 'archive' ) || 'rtsb_builder' === get_post_type( get_the_ID() ) ) {
	494	+ echo '<div class="rtsb-active-filters-wrapper"></div>';
523	495	}
524	496
525	497	// column_per_row.
526	498	if ( woocommerce_product_loop() ) {
		@@ -530,44 +502,28 @@
530	502	$this->row( $this->wc_product_loop( $wp_query, $metas, $template ), $metas, '', $settings );
531	503	}
532	504
533	505	// Pagination.
534		- $this->html .= '<div class="rtsb-archive-pagination-wrap" data-per-page="' . absint( $posts_per_page ) . '">';
	506	+ $this->html .= '<div class="rtsb-archive-pagination-wrap">';
535	507
536	508	if ( $pagination ) {
537	509	if ( Fns::product_filters_has_ajax( apply_filters( 'rtsb/builder/set/current/page/type', '' ) ) ) {
538	510	if ( $wp_query->max_num_pages > 1 ) {
539		- $posts_loading_type = ! empty( $metas['posts_loading_type'] ) ? $metas['posts_loading_type'] : 'pagination';
	511	+ $this->add_attribute(
	512	+ 'rtsb_load_more_btn_attr_' . $rand,
	513	+ [
	514	+ 'data-paged' => '2',
	515	+ 'data-max-page' => $wp_query->max_num_pages,
	516	+ ]
	517	+ );
540	518
541		- if ( 'pagination_ajax' === $posts_loading_type ) {
542		- $this->html .= Fns::custom_pagination( $wp_query->max_num_pages, $posts_per_page, true );
543		- } elseif ( 'pagination' === $posts_loading_type ) {
544		- $this->html .= Fns::custom_pagination( $wp_query->max_num_pages, $posts_per_page, false );
545		- } elseif ( 'load_on_scroll' === $posts_loading_type ) {
546		- $this->html .= "<div class='rtsb-infinite-scroll' data-trigger='1' data-paged='2' data-max-page='{$wp_query->max_num_pages}'>
547		- <div class='rtsb-infinite-action'>
548		- <div class='rtsb-loadmore-loading rtsb-ball-clip-rotate'><div></div></div>
549		- </div>
550		- </div>";
551		- } else {
552		- $load_more_text = ! empty( $metas['load_more_text'] ) ? $metas['load_more_text'] : esc_html__( 'Load More', 'shopbuilder' );
553		-
554		- $this->add_attribute(
555		- 'rtsb_load_more_btn_attr_' . $rand,
556		- [
557		- 'data-paged' => '2',
558		- 'data-max-page' => $wp_query->max_num_pages,
559		- ]
560		- );
561		-
562		- $this->html .=
563		- "<div class='rtsb-load-more rtsb-pos-r'>
564		- <button {$this->get_attribute_string( 'rtsb_load_more_btn_attr_' . $rand )}>
565		- <span>" . esc_html( $load_more_text ) . "</span>
566		- </button>
567		- <div class='rtsb-loadmore-loading rtsb-ball-clip-rotate'><div></div></div>
568		- </div>";
569		- }
	519	+ $this->html .=
	520	+ "<div class='rtsb-load-more rtsb-pos-r'>
	521	+ <button {$this->get_attribute_string( 'rtsb_load_more_btn_attr_' . $rand )}>
	522	+ <span>" . esc_html__( 'Load More', 'shopbuilder' ) . "</span>
	523	+ </button>
	524	+ <div class='rtsb-loadmore-loading rtsb-ball-clip-rotate'><div></div></div>
	525	+ </div>";
570	526	}
571	527	} else {
572	528	$pagination_args = [
573	529	'query' => $wp_query,
		@@ -584,9 +540,9 @@
584	540	} else {
585	541	$this->no_products_msg( $metas );
586	542	}
587	543
588		- if ( $is_preview || ! empty( $restore_query ) ) {
	544	+ if ( $is_preview ) {
589	545	// phpcs:disable
590	546	$wp_query = $main_query;
591	547	$post = $main_post;
592	548
		@@ -594,11 +550,8 @@
594	550	wp_reset_postdata();
595	551	// phpcs:enable
596	552	}
597	553
598		- // Ensure the container's data-rtsb-ajax uses the same posts_per_page as the initial render.
599		- $settings['pagination_per_page'] = $posts_per_page;
600		-
601	554	// Container.
602	555	$this->container( $this->html, $settings, 'rtsb-products-container', $template );
603	556
604	557	return $this->html;
		@@ -652,13 +605,8 @@
652	605	*
653	606	* @return string
654	607	*/
655	608	public function category_view( $template, $settings, $is_single = false ) {
656		- // Reset the shared singleton's html buffer so leftover markup from a
657		- // previously rendered widget (e.g. a products grid that ran earlier
658		- // in the same request) doesn't get folded into the categories
659		- // container by container() below.
660		- $this->html = '';
661	609	$this->get_settings = $settings;
662	610
663	611	$metas = RenderHelpers::meta_dataset( $settings, $template, $this->get_settings_for_display() );
664	612	$taxonomy = $metas['category_source'];
		@@ -688,9 +636,9 @@
688	636	if ( ! is_wp_error( $taxonomy_query ) && ! empty( $taxonomy_query ) ) {
689	637	// Row.
690	638	$this->row( $this->category_loop( $taxonomy_query, $metas, $template, $is_single ), $metas );
691	639	} else {
692		- $this->html = '<p>' . esc_html__( 'No categories found', 'shopbuilder' ) . '</p>';
	640	+ $this->html .= '<p>' . esc_html__( 'No categories found', 'shopbuilder' ) . '</p>';
693	641	}
694	642
695	643	// Container.
696	644	$this->container( $this->html, $settings, 'rtsb-categories-container', $is_single );
		@@ -1205,9 +1153,10 @@
1205	1153	);
1206	1154
1207	1155	$content .= '<a ' . $this->get_attribute_string( 'rtsb_add_to_cart_button_' . $id . $rand ) . '>';
1208	1156	$content .= $icon_html;
1209		- $content .= '<span class="button-text text ' . ( ! empty( $success ) ? 'has-success-text' : 'no-success-text' ) . '" data-success="' . esc_html( $success ) . '" data-cart-text="' . ( ! empty( $text ) ? esc_attr( $text ) : $tooltip_mapping['simple'] ) . '" data-variable-text="' . esc_attr( $text_btn ) . '">' . esc_html( $text_btn ) . '</span>';
	1157	+ $content .= '<span class="text ' . ( ! empty( $success ) ? 'has-success-text' : 'no-success-text' ) . '" data-success="' . esc_html( $success ) . '" data-cart-text="' . ( ! empty( $text ) ? esc_attr( $text ) : $tooltip_mapping['simple'] ) . '" data-variable-text="' . esc_attr( $text_btn ) . '">' . esc_html( $text_btn ) . '</span>';
	1158	+ $content .= '<span></span>';
1210	1159	} elseif ( 'external' === $type ) {
1211	1160	if ( ! empty( $ext_link ) ) {
1212	1161	$cart_attr['target'] = '_blank';
1213	1162	}
		@@ -1217,9 +1166,9 @@
1217	1166	$this->add_attribute( 'rtsb_add_to_cart_button_' . $id . $rand, $cart_attr );
1218	1167
1219	1168	$content .= '<a ' . $this->get_attribute_string( 'rtsb_add_to_cart_button_' . $id . $rand ) . '>';
1220	1169	$content .= $icon_html;
1221		- $content .= '<span class="button-text text">' . ( ! empty( $btn_txt ) ? esc_html( $btn_txt ) : esc_html__( 'Buy Product', 'shopbuilder' ) ) . '</span>';
	1170	+ $content .= '<span class="text">' . ( ! empty( $btn_txt ) ? esc_html( $btn_txt ) : esc_html__( 'Buy Product', 'shopbuilder' ) ) . '</span>';
1222	1171	} else {
1223	1172	$cart_attr['href'] = $cart_attr['href'] . '?add-to-cart=' . absint( $id );
1224	1173	$cart_attr['class'] .= ' rtsb-add-to-cart-btn';
1225	1174	$cart_attr['data-type'] = $type;
		@@ -1228,9 +1177,10 @@
1228	1177	$this->add_attribute( 'rtsb_add_to_cart_button_' . $id . $rand, $cart_attr );
1229	1178
1230	1179	$content .= '<a ' . $this->get_attribute_string( 'rtsb_add_to_cart_button_' . $id . $rand ) . '>';
1231	1180	$content .= $icon_html;
1232		- $content .= '<span class="button-text text ' . ( ! empty( $success ) ? 'has-success-text' : 'no-success-text' ) . '" data-success="' . esc_html( $success ) . '">' . esc_html( $text ) . '</span>';
	1181	+ $content .= '<span class="text ' . ( ! empty( $success ) ? 'has-success-text' : 'no-success-text' ) . '" data-success="' . esc_html( $success ) . '">' . esc_html( $text ) . '</span>';
	1182	+ $content .= '<span></span>';
1233	1183	}
1234	1184
1235	1185	$content .= '</a>';
1236	1186	$content .= '</div>';
		@@ -1328,17 +1278,8 @@
1328	1278	'ajax' => $ajax,
1329	1279	];
1330	1280
1331	1281	if ( 'pagination' === $meta['posts_loading_type'] ) {
1332		- if ( $is_grid ) {
1333		- $html_utility .= Fns::custom_pagination(
1334		- $total_page,
1335		- 'wc' === $query_type ? $per_page : $posts_per_page
1336		- );
1337		- }
1338		- } elseif ( 'pagination_ajax' === $meta['posts_loading_type'] && ! rtsb()->has_pro() ) {
1339		- // Free version fallback: render non-AJAX number pagination so filter
1340		- // params in the URL are preserved via get_pagenum_link().
1341	1282	if ( $is_grid ) {
1342	1283	$html_utility .= Fns::custom_pagination(
1343	1284	$total_page,
1344	1285	'wc' === $query_type ? $per_page : $posts_per_page