Merge pull request #249 from davseve/ED-11967-to-main

Disable auto activation on merge
davseve · Sep 7, 2023 · ca0ed8c · ca0ed8c
2 parents 0b68ee6 + 3aec88c
commit ca0ed8c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 69 deletions.
diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
@@ -2,15 +2,15 @@ name: Automated Latest Release
 
 env:
   CHANNEL: 'latest'
-  PRERELEASE: 'true'
+  PRERELEASE: 'false'
 
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - main
+# on:
+#   pull_request:
+#     types: [closed]
+#     branches:
+#       - main
 
-# Only cancel in-progress jobs or runs for the current workflow run
+# Cancel in-progress jobs or runs for the current workflow run
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -24,11 +24,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: main
-      - name: Get Lables
-        run: |
-          echo "LABELS: ${{ github.event.pull_request.labels }}"
-          x=${{ toJson(github.event.pull_request.labels.*.name) }}
-          echo "Labels 2 is $x"
       - name: Get Configuration
         id: configuration
         uses: rgarcia-phi/json-to-variables@9835d537368468c4e4de5254dc3efeadda183793

diff --git a/includes/widgets/rating.php b/includes/widgets/rating.php
@@ -113,53 +113,6 @@ private function add_style_tab() {
 			]
 		);
 
-		$this->add_responsive_control(
-			'icon_gap',
-			[
-				'label' => esc_html__( 'Spacing', 'elementor' ),
-				'type' => Controls_Manager::SLIDER,
-				'range' => [
-					'em' => [
-						'min' => 0,
-						'max' => 10,
-						'step' => 0.1,
-					],
-					'rem' => [
-						'min' => 0,
-						'max' => 10,
-						'step' => 0.1,
-					],
-				],
-				'size_units' => [ 'px', 'em', 'rem', 'vw', 'custom' ],
-				'selectors' => [
-					'{{WRAPPER}}' => '--e-rating-gap: {{SIZE}}{{UNIT}}',
-				],
-			]
-		);
-
-		$this->add_control(
-			'icon_color',
-			[
-				'label' => esc_html__( 'Color', 'elementor' ),
-				'type' => Controls_Manager::COLOR,
-				'selectors' => [
-					'{{WRAPPER}}' => '--e-rating-star-marked-color: {{VALUE}}',
-				],
-				'separator' => 'before',
-			]
-		);
-
-		$this->add_control(
-			'icon_unmasked_color',
-			[
-				'label' => esc_html__( 'Unmarked Color', 'elementor' ),
-				'type' => Controls_Manager::COLOR,
-				'selectors' => [
-					'{{WRAPPER}}' => '--e-rating-star-color: {{VALUE}}',
-				],
-			]
-		);
-
 		$this->end_controls_section();
 	}
 
@@ -197,9 +150,8 @@ protected function register_controls() {
 			[
 				'label' => esc_html__( 'Rating', 'elementor' ),
 				'type' => Controls_Manager::NUMBER,
-				'placeholder' => 5,
 				'min' => 0,
-				'step' => 0.01,
+				'step' => 0.5,
 				'dynamic' => [
 					'active' => true,
 				],
@@ -264,26 +216,29 @@ protected function register_controls() {
 	}
 
 	protected function get_rating_value(): float {
-		return floatval( $this->get_settings_for_display( 'rating_value' ) );
+		$initial_value = $this->get_rating_scale();
+		$rating_value = $this->get_settings_for_display( 'rating_value' );
+
+		if ( '' === $rating_value ) {
+			$rating_value = $initial_value;
+		}
+
+		$rating_value = floatval( $rating_value );
+
+		return round( $rating_value, 2 );
 	}
 
 	protected function get_rating_scale(): int {
 		return intval( $this->get_settings_for_display( 'rating_scale' )['size'] );
 	}
 
 	protected function get_icon_marked_width( $icon_index ): string {
-		$initial_value = $this->get_rating_scale();
 		$rating_value = $this->get_rating_value();
 
-		if ( empty( $rating_value ) ) {
-			$rating_value = $initial_value;
-		}
-
 		$width = '0%';
 
 		if ( $rating_value >= $icon_index ) {
 			$width = '100%';
-
 		} elseif ( intval( ceil( $rating_value ) ) === $icon_index ) {
 			$width = ( $rating_value - ( $icon_index - 1 ) ) * 100 . '%';
 		}
@@ -334,7 +289,7 @@ protected function render() {
 
 		$this->add_render_attribute( 'widget_wrapper', [
 			'class' => 'e-rating-wrapper',
-			'itemprop' => 'reviewValue',
+			'itemprop' => 'ratingValue',
 			'content' => $this->get_rating_value(),
 			'role' => 'img',
 			'aria-label' => sprintf( esc_html__( 'Rated %1$s out of %2$s', 'elementor' ),