| @@ -184,10 +184,10 @@ | ||
| 184 | 184 | [ |
| 185 | 185 | 'label' => esc_html__( 'Alignment', 'elementor' ), |
| 186 | 186 | 'type' => Controls_Manager::CHOOSE, |
| 187 | 187 | 'options' => [ |
| 188 | - 'start' => [ | |
| 189 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 188 | + 'left' => [ | |
| 189 | + 'title' => esc_html__( 'Left', 'elementor' ), | |
| 190 | 190 | 'icon' => 'eicon-text-align-left', |
| 191 | 191 | ], |
| 192 | 192 | 'center' => [ |
| 193 | 193 | 'title' => esc_html__( 'Center', 'elementor' ), |
| @@ -192,18 +192,13 @@ | ||
| 192 | 192 | 'center' => [ |
| 193 | 193 | 'title' => esc_html__( 'Center', 'elementor' ), |
| 194 | 194 | 'icon' => 'eicon-text-align-center', |
| 195 | 195 | ], |
| 196 | - 'end' => [ | |
| 197 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 196 | + 'right' => [ | |
| 197 | + 'title' => esc_html__( 'Right', 'elementor' ), | |
| 198 | 198 | 'icon' => 'eicon-text-align-right', |
| 199 | 199 | ], |
| 200 | 200 | ], |
| 201 | - 'classes' => 'elementor-control-start-end', | |
| 202 | - 'selectors_dictionary' => [ | |
| 203 | - 'left' => is_rtl() ? 'end' : 'start', | |
| 204 | - 'right' => is_rtl() ? 'start' : 'end', | |
| 205 | - ], | |
| 206 | 201 | 'default' => 'center', |
| 207 | 202 | 'selectors' => [ |
| 208 | 203 | '{{WRAPPER}} .elementor-icon-wrapper' => 'text-align: {{VALUE}};', |
| 209 | 204 | ], |
| @@ -469,15 +464,15 @@ | ||
| 469 | 464 | $is_new = empty( $settings['icon'] ) && Icons_Manager::is_migration_allowed(); |
| 470 | 465 | |
| 471 | 466 | ?> |
| 472 | 467 | <div <?php $this->print_render_attribute_string( 'wrapper' ); ?>> |
| 473 | - <<?php Utils::print_validated_html_tag( $icon_tag ); ?> <?php $this->print_render_attribute_string( 'icon-wrapper' ); ?>> | |
| 468 | + <<?php Utils::print_unescaped_internal_string( $icon_tag . ' ' . $this->get_render_attribute_string( 'icon-wrapper' ) ); ?>> | |
| 474 | 469 | <?php if ( $is_new || $migrated ) : |
| 475 | 470 | Icons_Manager::render_icon( $settings['selected_icon'], [ 'aria-hidden' => 'true' ] ); |
| 476 | 471 | else : ?> |
| 477 | 472 | <i <?php $this->print_render_attribute_string( 'icon' ); ?>></i> |
| 478 | 473 | <?php endif; ?> |
| 479 | - </<?php Utils::print_validated_html_tag( $icon_tag ); ?>> | |
| 474 | + </<?php Utils::print_unescaped_internal_string( $icon_tag ); ?>> | |
| 480 | 475 | </div> |
| 481 | 476 | <?php |
| 482 | 477 | } |
| 483 | 478 | |
| @@ -495,17 +490,15 @@ | ||
| 495 | 490 | if ( '' === settings.selected_icon.value ) { |
| 496 | 491 | return; |
| 497 | 492 | } |
| 498 | 493 | |
| 499 | - let iconTag = 'div'; | |
| 500 | - | |
| 501 | - if ( settings.link?.url ) { | |
| 502 | - view.addRenderAttribute( 'link_url', 'href', elementor.helpers.sanitizeUrl( settings.link?.url ) ); | |
| 503 | - iconTag = 'a'; | |
| 494 | + if ( settings.link.url ) { | |
| 495 | + view.addRenderAttribute( 'link_url', 'href', elementor.helpers.sanitizeUrl( settings.link.url ) ); | |
| 504 | 496 | } |
| 505 | 497 | |
| 506 | 498 | const iconHTML = elementor.helpers.renderIcon( view, settings.selected_icon, { 'aria-hidden': true }, 'i' , 'object' ), |
| 507 | - migrated = elementor.helpers.isIconMigrated( settings, 'selected_icon' ); | |
| 499 | + migrated = elementor.helpers.isIconMigrated( settings, 'selected_icon' ), | |
| 500 | + iconTag = settings.link.url ? 'a' : 'div'; | |
| 508 | 501 | |
| 509 | 502 | view.addRenderAttribute( 'icon', 'class', 'elementor-icon' ); |
| 510 | 503 | |
| 511 | 504 | if ( '' !== settings.hover_animation ) { |
| @@ -521,10 +514,6 @@ | ||
| 521 | 514 | <# } #> |
| 522 | 515 | </{{{ iconTag }}}> |
| 523 | 516 | </div> |
| 524 | 517 | <?php |
| 525 | - } | |
| 526 | - | |
| 527 | - public function render_markdown(): string { | |
| 528 | - return ''; | |
| 529 | 518 | } |
| 530 | 519 | } |