| @@ -76,12 +76,8 @@ | ||
| 76 | 76 | protected function is_dynamic_content(): bool { |
| 77 | 77 | return false; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - public function has_widget_inner_wrapper(): bool { | |
| 81 | - return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' ); | |
| 82 | - } | |
| 83 | - | |
| 84 | 80 | /** |
| 85 | 81 | * Get style dependencies. |
| 86 | 82 | * |
| 87 | 83 | * Retrieve the list of style dependencies the widget requires. |
| @@ -243,13 +239,14 @@ | ||
| 243 | 239 | 'max' => 50, |
| 244 | 240 | ], |
| 245 | 241 | ], |
| 246 | 242 | 'selectors' => [ |
| 247 | - '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:last-child)' => 'padding-block-end: calc({{SIZE}}{{UNIT}}/2)', | |
| 248 | - '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:first-child)' => 'margin-block-start: calc({{SIZE}}{{UNIT}}/2)', | |
| 249 | - '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item' => 'margin-inline: calc({{SIZE}}{{UNIT}}/2)', | |
| 250 | - '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items' => 'margin-inline: calc(-{{SIZE}}{{UNIT}}/2)', | |
| 251 | - '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item:after' => 'inset-inline-end: calc(-{{SIZE}}{{UNIT}}/2)', | |
| 243 | + '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:last-child)' => 'padding-bottom: calc({{SIZE}}{{UNIT}}/2)', | |
| 244 | + '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:first-child)' => 'margin-top: calc({{SIZE}}{{UNIT}}/2)', | |
| 245 | + '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item' => 'margin-right: calc({{SIZE}}{{UNIT}}/2); margin-left: calc({{SIZE}}{{UNIT}}/2)', | |
| 246 | + '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items' => 'margin-right: calc(-{{SIZE}}{{UNIT}}/2); margin-left: calc(-{{SIZE}}{{UNIT}}/2)', | |
| 247 | + 'body.rtl {{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item:after' => 'left: calc(-{{SIZE}}{{UNIT}}/2)', | |
| 248 | + 'body:not(.rtl) {{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item:after' => 'right: calc(-{{SIZE}}{{UNIT}}/2)', | |
| 252 | 249 | ], |
| 253 | 250 | ] |
| 254 | 251 | ); |
| 255 | 252 | |
| @@ -258,10 +255,10 @@ | ||
| 258 | 255 | [ |
| 259 | 256 | 'label' => esc_html__( 'Alignment', 'elementor' ), |
| 260 | 257 | 'type' => Controls_Manager::CHOOSE, |
| 261 | 258 | 'options' => [ |
| 262 | - 'start' => [ | |
| 263 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 259 | + 'left' => [ | |
| 260 | + 'title' => esc_html__( 'Left', 'elementor' ), | |
| 264 | 261 | 'icon' => 'eicon-h-align-left', |
| 265 | 262 | ], |
| 266 | 263 | 'center' => [ |
| 267 | 264 | 'title' => esc_html__( 'Center', 'elementor' ), |
| @@ -266,19 +263,14 @@ | ||
| 266 | 263 | 'center' => [ |
| 267 | 264 | 'title' => esc_html__( 'Center', 'elementor' ), |
| 268 | 265 | 'icon' => 'eicon-h-align-center', |
| 269 | 266 | ], |
| 270 | - 'end' => [ | |
| 271 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 267 | + 'right' => [ | |
| 268 | + 'title' => esc_html__( 'Right', 'elementor' ), | |
| 272 | 269 | 'icon' => 'eicon-h-align-right', |
| 273 | 270 | ], |
| 274 | 271 | ], |
| 275 | - 'classes_dictionary' => [ | |
| 276 | - 'left' => is_rtl() ? 'end' : 'start', | |
| 277 | - 'right' => is_rtl() ? 'start' : 'end', | |
| 278 | - ], | |
| 279 | 272 | 'prefix_class' => 'elementor%s-align-', |
| 280 | - 'classes' => 'elementor-control-start-end', | |
| 281 | 273 | ] |
| 282 | 274 | ); |
| 283 | 275 | |
| 284 | 276 | $this->add_control( |
| @@ -310,10 +302,10 @@ | ||
| 310 | 302 | 'condition' => [ |
| 311 | 303 | 'divider' => 'yes', |
| 312 | 304 | ], |
| 313 | 305 | 'selectors' => [ |
| 314 | - '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:last-child):after' => 'border-block-start-style: {{VALUE}}', | |
| 315 | - '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item:not(:last-child):after' => 'border-inline-start-style: {{VALUE}}', | |
| 306 | + '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:last-child):after' => 'border-top-style: {{VALUE}}', | |
| 307 | + '{{WRAPPER}} .elementor-icon-list-items.elementor-inline-items .elementor-icon-list-item:not(:last-child):after' => 'border-left-style: {{VALUE}}', | |
| 316 | 308 | ], |
| 317 | 309 | ] |
| 318 | 310 | ); |
| 319 | 311 | |
| @@ -335,10 +327,10 @@ | ||
| 335 | 327 | 'condition' => [ |
| 336 | 328 | 'divider' => 'yes', |
| 337 | 329 | ], |
| 338 | 330 | 'selectors' => [ |
| 339 | - '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:last-child):after' => 'border-block-start-width: {{SIZE}}{{UNIT}}', | |
| 340 | - '{{WRAPPER}} .elementor-inline-items .elementor-icon-list-item:not(:last-child):after' => 'border-inline-start-width: {{SIZE}}{{UNIT}}', | |
| 331 | + '{{WRAPPER}} .elementor-icon-list-items:not(.elementor-inline-items) .elementor-icon-list-item:not(:last-child):after' => 'border-top-width: {{SIZE}}{{UNIT}}', | |
| 332 | + '{{WRAPPER}} .elementor-inline-items .elementor-icon-list-item:not(:last-child):after' => 'border-left-width: {{SIZE}}{{UNIT}}', | |
| 341 | 333 | ], |
| 342 | 334 | ] |
| 343 | 335 | ); |
| 344 | 336 | |
| @@ -529,9 +521,9 @@ | ||
| 529 | 521 | ], |
| 530 | 522 | ], |
| 531 | 523 | 'separator' => 'after', |
| 532 | 524 | 'selectors' => [ |
| 533 | - '{{WRAPPER}} .elementor-icon-list-icon' => 'padding-inline-end: {{SIZE}}{{UNIT}};', | |
| 525 | + '{{WRAPPER}} .elementor-icon-list-icon' => is_rtl() ? 'padding-left: {{SIZE}}{{UNIT}};' : 'padding-right: {{SIZE}}{{UNIT}};', | |
| 534 | 526 | ], |
| 535 | 527 | ] |
| 536 | 528 | ); |
| 537 | 529 | |
| @@ -782,9 +774,9 @@ | ||
| 782 | 774 | <i class="<?php echo esc_attr( $item['icon'] ); ?>" aria-hidden="true"></i> |
| 783 | 775 | <?php } ?> |
| 784 | 776 | </span> |
| 785 | 777 | <?php endif; ?> |
| 786 | - <span <?php $this->print_render_attribute_string( $repeater_setting_key ); ?>><?php echo wp_kses_post( $item['text'] ); ?></span> | |
| 778 | + <span <?php $this->print_render_attribute_string( $repeater_setting_key ); ?>><?php $this->print_unescaped_setting( 'text', 'icon_list', $index ); ?></span> | |
| 787 | 779 | <?php if ( ! empty( $item['link']['url'] ) ) : ?> |
| 788 | 780 | </a> |
| 789 | 781 | <?php endif; ?> |
| 790 | 782 | </li> |
| @@ -802,34 +794,8 @@ | ||
| 802 | 794 | * |
| 803 | 795 | * @since 2.9.0 |
| 804 | 796 | * @access protected |
| 805 | 797 | */ |
| 806 | - public function render_markdown(): string { | |
| 807 | - $settings = $this->get_settings_for_display(); | |
| 808 | - | |
| 809 | - if ( empty( $settings['icon_list'] ) ) { | |
| 810 | - return ''; | |
| 811 | - } | |
| 812 | - | |
| 813 | - $lines = []; | |
| 814 | - | |
| 815 | - foreach ( $settings['icon_list'] as $item ) { | |
| 816 | - $text = Utils::html_to_plain_text( $item['text'] ?? '' ); | |
| 817 | - | |
| 818 | - if ( empty( $text ) ) { | |
| 819 | - continue; | |
| 820 | - } | |
| 821 | - | |
| 822 | - if ( ! empty( $item['link']['url'] ) ) { | |
| 823 | - $text = '[' . $text . '](' . esc_url( $item['link']['url'] ) . ')'; | |
| 824 | - } | |
| 825 | - | |
| 826 | - $lines[] = '- ' . $text; | |
| 827 | - } | |
| 828 | - | |
| 829 | - return implode( "\n", $lines ); | |
| 830 | - } | |
| 831 | - | |
| 832 | 798 | protected function content_template() { |
| 833 | 799 | ?> |
| 834 | 800 | <# |
| 835 | 801 | view.addRenderAttribute( 'icon_list', 'class', 'elementor-icon-list-items' ); |
| @@ -852,10 +818,10 @@ | ||
| 852 | 818 | |
| 853 | 819 | view.addInlineEditingAttributes( iconTextKey ); #> |
| 854 | 820 | |
| 855 | 821 | <li {{{ view.getRenderAttributeString( 'list_item' ) }}}> |
| 856 | - <# if ( item.link && item.link?.url ) { #> | |
| 857 | - <a href="{{ elementor.helpers.sanitizeUrl( item.link?.url ) }}"> | |
| 822 | + <# if ( item.link && item.link.url ) { #> | |
| 823 | + <a href="{{ elementor.helpers.sanitizeUrl( item.link.url ) }}"> | |
| 858 | 824 | <# } #> |
| 859 | 825 | <# if ( item.icon || item.selected_icon.value ) { #> |
| 860 | 826 | <span class="elementor-icon-list-icon"> |
| 861 | 827 | <# |
| @@ -869,9 +835,9 @@ | ||
| 869 | 835 | #> |
| 870 | 836 | </span> |
| 871 | 837 | <# } #> |
| 872 | 838 | <span {{{ view.getRenderAttributeString( iconTextKey ) }}}>{{{ item.text }}}</span> |
| 873 | - <# if ( item.link && item.link?.url ) { #> | |
| 839 | + <# if ( item.link && item.link.url ) { #> | |
| 874 | 840 | </a> |
| 875 | 841 | <# } #> |
| 876 | 842 | </li> |
| 877 | 843 | <# |