| @@ -959,8 +959,16 @@ | ||
| 959 | 959 | ); |
| 960 | 960 | |
| 961 | 961 | $this->start_controls_tabs( 'tabs_shape_dividers' ); |
| 962 | 962 | |
| 963 | + $shapes_options = [ | |
| 964 | + '' => esc_html__( 'None', 'elementor' ), | |
| 965 | + ]; | |
| 966 | + | |
| 967 | + foreach ( Shapes::get_shapes() as $shape_name => $shape_props ) { | |
| 968 | + $shapes_options[ $shape_name ] = $shape_props['title']; | |
| 969 | + } | |
| 970 | + | |
| 963 | 971 | foreach ( [ |
| 964 | 972 | 'top' => esc_html__( 'Top', 'elementor' ), |
| 965 | 973 | 'bottom' => esc_html__( 'Bottom', 'elementor' ), |
| 966 | 974 | ] as $side => $side_label ) { |
| @@ -976,12 +984,10 @@ | ||
| 976 | 984 | $this->add_control( |
| 977 | 985 | $base_control_key, |
| 978 | 986 | [ |
| 979 | 987 | 'label' => esc_html__( 'Type', 'elementor' ), |
| 980 | - 'type' => Controls_Manager::VISUAL_CHOICE, | |
| 981 | - 'label_block' => true, | |
| 982 | - 'columns' => 2, | |
| 983 | - 'options' => Shapes::get_shapes(), | |
| 988 | + 'type' => Controls_Manager::SELECT, | |
| 989 | + 'options' => $shapes_options, | |
| 984 | 990 | 'render_type' => 'none', |
| 985 | 991 | 'frontend_available' => true, |
| 986 | 992 | 'assets' => [ |
| 987 | 993 | 'styles' => [ |
| @@ -1186,10 +1192,10 @@ | ||
| 1186 | 1192 | [ |
| 1187 | 1193 | 'label' => esc_html__( 'Text Align', 'elementor' ), |
| 1188 | 1194 | 'type' => Controls_Manager::CHOOSE, |
| 1189 | 1195 | 'options' => [ |
| 1190 | - 'start' => [ | |
| 1191 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 1196 | + 'left' => [ | |
| 1197 | + 'title' => esc_html__( 'Left', 'elementor' ), | |
| 1192 | 1198 | 'icon' => 'eicon-text-align-left', |
| 1193 | 1199 | ], |
| 1194 | 1200 | 'center' => [ |
| 1195 | 1201 | 'title' => esc_html__( 'Center', 'elementor' ), |
| @@ -1194,10 +1200,10 @@ | ||
| 1194 | 1200 | 'center' => [ |
| 1195 | 1201 | 'title' => esc_html__( 'Center', 'elementor' ), |
| 1196 | 1202 | 'icon' => 'eicon-text-align-center', |
| 1197 | 1203 | ], |
| 1198 | - 'end' => [ | |
| 1199 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 1204 | + 'right' => [ | |
| 1205 | + 'title' => esc_html__( 'Right', 'elementor' ), | |
| 1200 | 1206 | 'icon' => 'eicon-text-align-right', |
| 1201 | 1207 | ], |
| 1202 | 1208 | 'justify' => [ |
| 1203 | 1209 | 'title' => esc_html__( 'Justified', 'elementor' ), |
| @@ -1203,13 +1209,8 @@ | ||
| 1203 | 1209 | 'title' => esc_html__( 'Justified', 'elementor' ), |
| 1204 | 1210 | 'icon' => 'eicon-text-align-justify', |
| 1205 | 1211 | ], |
| 1206 | 1212 | ], |
| 1207 | - 'classes' => 'elementor-control-start-end', | |
| 1208 | - 'selectors_dictionary' => [ | |
| 1209 | - 'left' => is_rtl() ? 'end' : 'start', | |
| 1210 | - 'right' => is_rtl() ? 'start' : 'end', | |
| 1211 | - ], | |
| 1212 | 1213 | 'selectors' => [ |
| 1213 | 1214 | '{{WRAPPER}} > .elementor-container' => 'text-align: {{VALUE}};', |
| 1214 | 1215 | ], |
| 1215 | 1216 | ] |
| @@ -1438,14 +1439,9 @@ | ||
| 1438 | 1439 | if ( ! settings.background_play_once ) { |
| 1439 | 1440 | videoAttributes += ' loop'; |
| 1440 | 1441 | } |
| 1441 | 1442 | |
| 1442 | - view.addRenderAttribute( | |
| 1443 | - 'background-video-container', | |
| 1444 | - { | |
| 1445 | - 'class': 'elementor-background-video-container', | |
| 1446 | - } | |
| 1447 | - ); | |
| 1443 | + view.addRenderAttribute( 'background-video-container', 'class', 'elementor-background-video-container' ); | |
| 1448 | 1444 | |
| 1449 | 1445 | if ( ! settings.background_play_on_mobile ) { |
| 1450 | 1446 | view.addRenderAttribute( 'background-video-container', 'class', 'elementor-hidden-mobile' ); |
| 1451 | 1447 | } |
| @@ -1450,15 +1446,15 @@ | ||
| 1450 | 1446 | view.addRenderAttribute( 'background-video-container', 'class', 'elementor-hidden-mobile' ); |
| 1451 | 1447 | } |
| 1452 | 1448 | #> |
| 1453 | 1449 | <div {{{ view.getRenderAttributeString( 'background-video-container' ) }}}> |
| 1454 | - <div class="elementor-background-video-embed" role="presentation"></div> | |
| 1455 | - <video class="elementor-background-video-hosted" role="presentation" {{ videoAttributes }}></video> | |
| 1450 | + <div class="elementor-background-video-embed"></div> | |
| 1451 | + <video class="elementor-background-video-hosted" {{ videoAttributes }}></video> | |
| 1456 | 1452 | </div> |
| 1457 | 1453 | <# } #> |
| 1458 | 1454 | <div class="elementor-background-overlay"></div> |
| 1459 | - <div class="elementor-shape elementor-shape-top" aria-hidden="true"></div> | |
| 1460 | - <div class="elementor-shape elementor-shape-bottom" aria-hidden="true"></div> | |
| 1455 | + <div class="elementor-shape elementor-shape-top"></div> | |
| 1456 | + <div class="elementor-shape elementor-shape-bottom"></div> | |
| 1461 | 1457 | <div class="elementor-container elementor-column-gap-{{ settings.gap }}"></div> |
| 1462 | 1458 | <?php |
| 1463 | 1459 | } |
| 1464 | 1460 | |
| @@ -1481,14 +1477,9 @@ | ||
| 1481 | 1477 | if ( 'video' === $settings['background_background'] ) : |
| 1482 | 1478 | if ( $settings['background_video_link'] ) : |
| 1483 | 1479 | $video_properties = Embed::get_video_properties( $settings['background_video_link'] ); |
| 1484 | 1480 | |
| 1485 | - $this->add_render_attribute( | |
| 1486 | - 'background-video-container', | |
| 1487 | - [ | |
| 1488 | - 'class' => 'elementor-background-video-container', | |
| 1489 | - ] | |
| 1490 | - ); | |
| 1481 | + $this->add_render_attribute( 'background-video-container', 'class', 'elementor-background-video-container' ); | |
| 1491 | 1482 | |
| 1492 | 1483 | if ( ! $settings['background_play_on_mobile'] ) { |
| 1493 | 1484 | $this->add_render_attribute( 'background-video-container', 'class', 'elementor-hidden-mobile' ); |
| 1494 | 1485 | } |
| @@ -1494,9 +1485,9 @@ | ||
| 1494 | 1485 | } |
| 1495 | 1486 | ?> |
| 1496 | 1487 | <div <?php $this->print_render_attribute_string( 'background-video-container' ); ?>> |
| 1497 | 1488 | <?php if ( $video_properties ) : ?> |
| 1498 | - <div class="elementor-background-video-embed" role="presentation"></div> | |
| 1489 | + <div class="elementor-background-video-embed"></div> | |
| 1499 | 1490 | <?php |
| 1500 | 1491 | else : |
| 1501 | 1492 | $video_tag_attributes = 'autoplay muted playsinline'; |
| 1502 | 1493 | if ( 'yes' !== $settings['background_play_once'] ) : |
| @@ -1502,9 +1493,9 @@ | ||
| 1502 | 1493 | if ( 'yes' !== $settings['background_play_once'] ) : |
| 1503 | 1494 | $video_tag_attributes .= ' loop'; |
| 1504 | 1495 | endif; |
| 1505 | 1496 | ?> |
| 1506 | - <video class="elementor-background-video-hosted" role="presentation" <?php | |
| 1497 | + <video class="elementor-background-video-hosted" <?php | |
| 1507 | 1498 | // PHPCS - the variable $video_tag_attributes is a plain string. |
| 1508 | 1499 | echo $video_tag_attributes; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 1509 | 1500 | ?>></video> |
| 1510 | 1501 | <?php endif; ?> |
| @@ -1632,9 +1623,9 @@ | ||
| 1632 | 1623 | return; |
| 1633 | 1624 | } |
| 1634 | 1625 | |
| 1635 | 1626 | ?> |
| 1636 | - <div class="elementor-shape elementor-shape-<?php echo esc_attr( $side ); ?>" aria-hidden="true" data-negative="<?php | |
| 1627 | + <div class="elementor-shape elementor-shape-<?php echo esc_attr( $side ); ?>" data-negative="<?php | |
| 1637 | 1628 | Utils::print_unescaped_internal_string( $negative ? 'true' : 'false' ); |
| 1638 | 1629 | ?>"> |
| 1639 | 1630 | <?php |
| 1640 | 1631 | // PHPCS - The file content is being read from a strict file path structure. |