← All changes | includes/widgets/star-rating.php +29 -80 4.2.0-dev2 → 3.21.3 View file →

		@@ -72,27 +72,9 @@
72	72	public function get_keywords() {
73	73	return [ 'star', 'rating', 'rate', 'review' ];
74	74	}
75	75
76		- protected function is_dynamic_content(): bool {
77		- return false;
78		- }
79		-
80	76	/**
81		- * Get style dependencies.
82		- *
83		- * Retrieve the list of style dependencies the widget requires.
84		- *
85		- * @since 3.24.0
86		- * @access public
87		- *
88		- * @return array Widget style dependencies.
89		- */
90		- public function get_style_depends(): array {
91		- return [ 'widget-star-rating' ];
92		- }
93		-
94		- /**
95	77	* Hide widget from panel.
96	78	*
97	79	* Hide the star rating widget from the panel.
98	80	*
		@@ -102,12 +84,8 @@
102	84	public function show_in_panel(): bool {
103	85	return false;
104	86	}
105	87
106		- public function has_widget_inner_wrapper(): bool {
107		- return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
108		- }
109		-
110	88	/**
111	89	* Register star rating widget controls.
112	90	*
113	91	* Adds different input fields to allow the user to change and customize the widget settings.
		@@ -214,10 +192,10 @@
214	192	[
215	193	'label' => esc_html__( 'Alignment', 'elementor' ),
216	194	'type' => Controls_Manager::CHOOSE,
217	195	'options' => [
218		- 'start' => [
219		- 'title' => esc_html__( 'Start', 'elementor' ),
	196	+ 'left' => [
	197	+ 'title' => esc_html__( 'Left', 'elementor' ),
220	198	'icon' => 'eicon-text-align-left',
221	199	],
222	200	'center' => [
223	201	'title' => esc_html__( 'Center', 'elementor' ),
		@@ -222,10 +200,10 @@
222	200	'center' => [
223	201	'title' => esc_html__( 'Center', 'elementor' ),
224	202	'icon' => 'eicon-text-align-center',
225	203	],
226		- 'end' => [
227		- 'title' => esc_html__( 'End', 'elementor' ),
	204	+ 'right' => [
	205	+ 'title' => esc_html__( 'Right', 'elementor' ),
228	206	'icon' => 'eicon-text-align-right',
229	207	],
230	208	'justify' => [
231	209	'title' => esc_html__( 'Justified', 'elementor' ),
		@@ -231,17 +209,8 @@
231	209	'title' => esc_html__( 'Justified', 'elementor' ),
232	210	'icon' => 'eicon-text-align-justify',
233	211	],
234	212	],
235		- 'classes' => 'elementor-control-start-end',
236		- 'classes_dictionary' => [
237		- 'left' => is_rtl() ? 'end' : 'start',
238		- 'right' => is_rtl() ? 'start' : 'end',
239		- ],
240		- 'selectors_dictionary' => [
241		- 'left' => is_rtl() ? 'end' : 'start',
242		- 'right' => is_rtl() ? 'start' : 'end',
243		- ],
244	213	'prefix_class' => 'elementor-star-rating%s--align-',
245	214	'selectors' => [
246	215	'{{WRAPPER}}' => 'text-align: {{VALUE}}',
247	216	],
		@@ -313,9 +282,10 @@
313	282	'max' => 5,
314	283	],
315	284	],
316	285	'selectors' => [
317		- '{{WRAPPER}}:not(.elementor-star-rating--align-justify) .elementor-star-rating__title' => 'margin-inline-end: {{SIZE}}{{UNIT}}',
	286	+ 'body:not(.rtl) {{WRAPPER}}:not(.elementor-star-rating--align-justify) .elementor-star-rating__title' => 'margin-right: {{SIZE}}{{UNIT}}',
	287	+ 'body.rtl {{WRAPPER}}:not(.elementor-star-rating--align-justify) .elementor-star-rating__title' => 'margin-left: {{SIZE}}{{UNIT}}',
318	288	],
319	289	]
320	290	);
321	291
		@@ -373,9 +343,10 @@
373	343	'max' => 5,
374	344	],
375	345	],
376	346	'selectors' => [
377		- '{{WRAPPER}} .elementor-star-rating i:not(:last-of-type)' => 'margin-inline-end: {{SIZE}}{{UNIT}}',
	347	+ 'body:not(.rtl) {{WRAPPER}} .elementor-star-rating i:not(:last-of-type)' => 'margin-right: {{SIZE}}{{UNIT}}',
	348	+ 'body.rtl {{WRAPPER}} .elementor-star-rating i:not(:last-of-type)' => 'margin-left: {{SIZE}}{{UNIT}}',
378	349	],
379	350	]
380	351	);
381	352
		@@ -411,9 +382,9 @@
411	382	*/
412	383	protected function get_rating() {
413	384	$settings = $this->get_settings_for_display();
414	385	$rating_scale = (int) $settings['rating_scale'];
415		- $rating = min( (float) $settings['rating'], $rating_scale );
	386	+ $rating = (float) $settings['rating'] > $rating_scale ? $rating_scale : $settings['rating'];
416	387
417	388	return [ $rating, $rating_scale ];
418	389	}
419	390
		@@ -434,17 +405,17 @@
434	405	$stars_html = '';
435	406
436	407	for ( $stars = 1.0; $stars <= $rating_data[1]; $stars++ ) {
437	408	if ( $stars <= $floored_rating ) {
438		- $stars_html .= '<i class="elementor-star-full" aria-hidden="true">' . $icon . '</i>';
	409	+ $stars_html .= '<i class="elementor-star-full">' . $icon . '</i>';
439	410	} elseif ( $floored_rating + 1 === $stars && $rating !== $floored_rating ) {
440		- $stars_html .= '<i class="elementor-star-' . ( $rating - $floored_rating ) * 10 . '" aria-hidden="true">' . $icon . '</i>';
	411	+ $stars_html .= '<i class="elementor-star-' . ( $rating - $floored_rating ) * 10 . '">' . $icon . '</i>';
441	412	} else {
442		- $stars_html .= '<i class="elementor-star-empty" aria-hidden="true">' . $icon . '</i>';
	413	+ $stars_html .= '<i class="elementor-star-empty">' . $icon . '</i>';
443	414	}
444	415	}
445	416
446		- Utils::print_unescaped_internal_string( $stars_html );
	417	+ return $stars_html;
447	418	}
448	419
449	420	/**
450	421	* @since 2.3.0
		@@ -452,14 +423,9 @@
452	423	*/
453	424	protected function render() {
454	425	$settings = $this->get_settings_for_display();
455	426	$rating_data = $this->get_rating();
456		- $textual_rating = sprintf(
457		- /* translators: 1: Rating value. 2: Rating scale. */
458		- esc_html__( 'Rated %1$s out of %2$s', 'elementor' ),
459		- $rating_data[0],
460		- $rating_data[1]
461		- );
	427	+ $textual_rating = $rating_data[0] . '/' . $rating_data[1];
462	428	$icon = '&#xE934;';
463	429
464	430	if ( 'star_fontawesome' === $settings['star_style'] ) {
465	431	if ( 'outline' === $settings['unmarked_star_style'] ) {
		@@ -474,48 +440,28 @@
474	440	}
475	441
476	442	$this->add_render_attribute( 'icon_wrapper', [
477	443	'class' => 'elementor-star-rating',
	444	+ 'title' => $textual_rating,
478	445	'itemtype' => 'http://schema.org/Rating',
479	446	'itemscope' => '',
480	447	'itemprop' => 'reviewRating',
481	448	] );
	449	+
	450	+ $schema_rating = '<span itemprop="ratingValue" class="elementor-screen-only">' . $textual_rating . '</span>';
	451	+ $stars_element = '<div ' . $this->get_render_attribute_string( 'icon_wrapper' ) . '>' . $this->render_stars( $icon ) . ' ' . $schema_rating . '</div>';
482	452	?>
	453	+
483	454	<div class="elementor-star-rating__wrapper">
484	455	<?php if ( ! Utils::is_empty( $settings['title'] ) ) : ?>
485	456	<div class="elementor-star-rating__title"><?php echo esc_html( $settings['title'] ); ?></div>
486		- <?php endif; ?>
487		- <div <?php $this->print_render_attribute_string( 'icon_wrapper' ); ?>>
488		- <?php $this->render_stars( $icon ); ?>
489		- <span itemprop="ratingValue" class="elementor-screen-only"><?php echo esc_html( $textual_rating ); ?></span>
490		- </div>
	457	+ <?php endif;
	458	+ // PHPCS - $stars_element contains an HTML string that cannot be escaped. ?>
	459	+ <?php echo $stars_element; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
491	460	</div>
492	461	<?php
493	462	}
494	463
495		- public function render_markdown(): string {
496		- $settings = $this->get_settings_for_display();
497		- $title = Utils::html_to_plain_text( $settings['title'] ?? '' );
498		- $rating = floatval( $settings['rating'] ?? 0 );
499		- $scale = intval( $settings['rating_scale'] ?? 5 );
500		-
501		- if ( empty( $rating ) ) {
502		- return '';
503		- }
504		-
505		- $full_stars = intval( floor( $rating ) );
506		- $empty_stars = $scale - $full_stars;
507		- $stars = str_repeat( '★', $full_stars ) . str_repeat( '☆', max( 0, $empty_stars ) );
508		-
509		- $md = $stars . ' ' . $rating . '/' . $scale;
510		-
511		- if ( ! empty( $title ) ) {
512		- $md .= "\n\n" . $title;
513		- }
514		-
515		- return $md;
516		- }
517		-
518	464	/**
519	465	* @since 2.9.0
520	466	* @access protected
521	467	*/
		@@ -529,9 +475,9 @@
529	475	return [ rating, ratingScale ];
530	476	},
531	477	ratingData = getRating(),
532	478	rating = ratingData[0],
533		- textualRating = 'Rated ' + ratingData[0] + ' out of ' + ratingData[1],
	479	+ textualRating = ratingData[0] + '/' + ratingData[1],
534	480	renderStars = function( icon ) {
535	481	var starsHtml = '',
536	482	flooredRating = Math.floor( rating );
537	483
		@@ -536,13 +482,13 @@
536	482	flooredRating = Math.floor( rating );
537	483
538	484	for ( var stars = 1; stars <= ratingData[1]; stars++ ) {
539	485	if ( stars <= flooredRating ) {
540		- starsHtml += '<i class="elementor-star-full" aria-hidden="true">' + icon + '</i>';
	486	+ starsHtml += '<i class="elementor-star-full">' + icon + '</i>';
541	487	} else if ( flooredRating + 1 === stars && rating !== flooredRating ) {
542		- starsHtml += '<i class="elementor-star-' + ( rating - flooredRating ).toFixed( 1 ) * 10 + '" aria-hidden="true">' + icon + '</i>';
	488	+ starsHtml += '<i class="elementor-star-' + ( rating - flooredRating ).toFixed( 1 ) * 10 + '">' + icon + '</i>';
543	489	} else {
544		- starsHtml += '<i class="elementor-star-empty" aria-hidden="true">' + icon + '</i>';
	490	+ starsHtml += '<i class="elementor-star-empty">' + icon + '</i>';
545	491	}
546	492	}
547	493
548	494	return starsHtml;
		@@ -562,13 +508,15 @@
562	508	}
563	509
564	510	view.addRenderAttribute( 'iconWrapper', 'class', 'elementor-star-rating' );
565	511	view.addRenderAttribute( 'iconWrapper', 'itemtype', 'http://schema.org/Rating' );
	512	+ view.addRenderAttribute( 'iconWrapper', 'title', textualRating );
566	513	view.addRenderAttribute( 'iconWrapper', 'itemscope', '' );
567	514	view.addRenderAttribute( 'iconWrapper', 'itemprop', 'reviewRating' );
568	515
569	516	var stars = renderStars( icon );
570	517	#>
	518	+
571	519	<div class="elementor-star-rating__wrapper">
572	520	<# if ( ! _.isEmpty( settings.title ) ) { #>
573	521	<div class="elementor-star-rating__title">{{ settings.title }}</div>
574	522	<# } #>
		@@ -576,7 +524,8 @@
576	524	{{{ stars }}}
577	525	<span itemprop="ratingValue" class="elementor-screen-only">{{ textualRating }}</span>
578	526	</div>
579	527	</div>
	528	+
580	529	<?php
581	530	}
582	531	}