| @@ -89,19 +89,17 @@ | ||
| 89 | 89 | public function get_keywords() { |
| 90 | 90 | return [ 'text', 'editor' ]; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | + protected function is_dynamic_content(): bool { | |
| 94 | + return false; | |
| 95 | + } | |
| 96 | + | |
| 93 | 97 | /** |
| 94 | 98 | * Get style dependencies. |
| 95 | 99 | * |
| 96 | 100 | * Retrieve the list of style dependencies the widget requires. |
| 97 | 101 | * |
| 98 | - * The 'widget-text-editor' style is required only when the drop cap is used. | |
| 99 | - * Therefor, style should not be loaded on the widget level, rather only on | |
| 100 | - * control level when the drop cap is active. | |
| 101 | - * | |
| 102 | - * Only in the Editor, these style should be loaded on the widget level. | |
| 103 | - * | |
| 104 | 102 | * @since 3.24.0 |
| 105 | 103 | * @access public |
| 106 | 104 | * |
| 107 | 105 | * @return array Widget style dependencies. |
| @@ -106,19 +104,11 @@ | ||
| 106 | 104 | * |
| 107 | 105 | * @return array Widget style dependencies. |
| 108 | 106 | */ |
| 109 | 107 | public function get_style_depends(): array { |
| 110 | - $style_dependencies = Plugin::$instance->editor->is_edit_mode() || Plugin::$instance->preview->is_preview_mode() | |
| 111 | - ? [ 'widget-text-editor' ] | |
| 112 | - : []; | |
| 113 | - | |
| 114 | - return $style_dependencies; | |
| 108 | + return [ 'widget-text-editor' ]; | |
| 115 | 109 | } |
| 116 | 110 | |
| 117 | - public function has_widget_inner_wrapper(): bool { | |
| 118 | - return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' ); | |
| 119 | - } | |
| 120 | - | |
| 121 | 111 | /** |
| 122 | 112 | * Register text editor widget controls. |
| 123 | 113 | * |
| 124 | 114 | * Adds different input fields to allow the user to change and customize the widget settings. |
| @@ -150,25 +140,8 @@ | ||
| 150 | 140 | 'label_off' => esc_html__( 'Off', 'elementor' ), |
| 151 | 141 | 'label_on' => esc_html__( 'On', 'elementor' ), |
| 152 | 142 | 'prefix_class' => 'elementor-drop-cap-', |
| 153 | 143 | 'frontend_available' => true, |
| 154 | - 'assets' => [ | |
| 155 | - 'styles' => [ | |
| 156 | - [ | |
| 157 | - 'name' => 'widget-text-editor', | |
| 158 | - 'conditions' => [ | |
| 159 | - 'terms' => [ | |
| 160 | - [ | |
| 161 | - 'name' => 'drop_cap', | |
| 162 | - 'operator' => '===', | |
| 163 | - 'value' => 'yes', | |
| 164 | - ], | |
| 165 | - ], | |
| 166 | - ], | |
| 167 | - ], | |
| 168 | - ], | |
| 169 | - | |
| 170 | - ], | |
| 171 | 144 | ] |
| 172 | 145 | ); |
| 173 | 146 | |
| 174 | 147 | $this->add_responsive_control( |
| @@ -257,10 +230,10 @@ | ||
| 257 | 230 | [ |
| 258 | 231 | 'label' => esc_html__( 'Alignment', 'elementor' ), |
| 259 | 232 | 'type' => Controls_Manager::CHOOSE, |
| 260 | 233 | 'options' => [ |
| 261 | - 'start' => [ | |
| 262 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 234 | + 'left' => [ | |
| 235 | + 'title' => esc_html__( 'Left', 'elementor' ), | |
| 263 | 236 | 'icon' => 'eicon-text-align-left', |
| 264 | 237 | ], |
| 265 | 238 | 'center' => [ |
| 266 | 239 | 'title' => esc_html__( 'Center', 'elementor' ), |
| @@ -265,10 +238,10 @@ | ||
| 265 | 238 | 'center' => [ |
| 266 | 239 | 'title' => esc_html__( 'Center', 'elementor' ), |
| 267 | 240 | 'icon' => 'eicon-text-align-center', |
| 268 | 241 | ], |
| 269 | - 'end' => [ | |
| 270 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 242 | + 'right' => [ | |
| 243 | + 'title' => esc_html__( 'Right', 'elementor' ), | |
| 271 | 244 | 'icon' => 'eicon-text-align-right', |
| 272 | 245 | ], |
| 273 | 246 | 'justify' => [ |
| 274 | 247 | 'title' => esc_html__( 'Justified', 'elementor' ), |
| @@ -274,76 +247,15 @@ | ||
| 274 | 247 | 'title' => esc_html__( 'Justified', 'elementor' ), |
| 275 | 248 | 'icon' => 'eicon-text-align-justify', |
| 276 | 249 | ], |
| 277 | 250 | ], |
| 278 | - 'classes' => 'elementor-control-start-end', | |
| 279 | - 'selectors_dictionary' => [ | |
| 280 | - 'left' => is_rtl() ? 'end' : 'start', | |
| 281 | - 'right' => is_rtl() ? 'start' : 'end', | |
| 282 | - ], | |
| 283 | 251 | 'selectors' => [ |
| 284 | 252 | '{{WRAPPER}}' => 'text-align: {{VALUE}};', |
| 285 | 253 | ], |
| 286 | - 'separator' => 'after', | |
| 287 | 254 | ] |
| 288 | 255 | ); |
| 289 | 256 | |
| 290 | - $this->add_group_control( | |
| 291 | - Group_Control_Typography::get_type(), | |
| 292 | - [ | |
| 293 | - 'name' => 'typography', | |
| 294 | - 'global' => [ | |
| 295 | - 'default' => Global_Typography::TYPOGRAPHY_TEXT, | |
| 296 | - ], | |
| 297 | - ] | |
| 298 | - ); | |
| 299 | - | |
| 300 | - $this->add_group_control( | |
| 301 | - Group_Control_Text_Shadow::get_type(), | |
| 302 | - [ | |
| 303 | - 'name' => 'text_shadow', | |
| 304 | - 'selector' => '{{WRAPPER}}', | |
| 305 | - ] | |
| 306 | - ); | |
| 307 | - | |
| 308 | - $this->add_responsive_control( | |
| 309 | - 'paragraph_spacing', | |
| 310 | - [ | |
| 311 | - 'label' => esc_html__( 'Paragraph Spacing', 'elementor' ), | |
| 312 | - 'type' => Controls_Manager::SLIDER, | |
| 313 | - 'size_units' => [ 'px', 'em', 'rem', 'vh', 'custom' ], | |
| 314 | - 'range' => [ | |
| 315 | - 'px' => [ | |
| 316 | - 'max' => 100, | |
| 317 | - ], | |
| 318 | - 'em' => [ | |
| 319 | - 'min' => 0.1, | |
| 320 | - 'max' => 20, | |
| 321 | - ], | |
| 322 | - ], | |
| 323 | - 'selectors' => [ | |
| 324 | - '{{WRAPPER}} p' => 'margin-block-end: {{SIZE}}{{UNIT}}', | |
| 325 | - ], | |
| 326 | - ] | |
| 327 | - ); | |
| 328 | - | |
| 329 | 257 | $this->add_control( |
| 330 | - 'separator', | |
| 331 | - [ | |
| 332 | - 'type' => Controls_Manager::DIVIDER, | |
| 333 | - ] | |
| 334 | - ); | |
| 335 | - | |
| 336 | - $this->start_controls_tabs( 'link_colors' ); | |
| 337 | - | |
| 338 | - $this->start_controls_tab( | |
| 339 | - 'colors_normal', | |
| 340 | - [ | |
| 341 | - 'label' => esc_html__( 'Normal', 'elementor' ), | |
| 342 | - ] | |
| 343 | - ); | |
| 344 | - | |
| 345 | - $this->add_control( | |
| 346 | 258 | 'text_color', |
| 347 | 259 | [ |
| 348 | 260 | 'label' => esc_html__( 'Text Color', 'elementor' ), |
| 349 | 261 | 'type' => Controls_Manager::COLOR, |
| @@ -356,58 +268,26 @@ | ||
| 356 | 268 | ], |
| 357 | 269 | ] |
| 358 | 270 | ); |
| 359 | 271 | |
| 360 | - $this->add_control( | |
| 361 | - 'link_color', | |
| 272 | + $this->add_group_control( | |
| 273 | + Group_Control_Typography::get_type(), | |
| 362 | 274 | [ |
| 363 | - 'label' => esc_html__( 'Link Color', 'elementor' ), | |
| 364 | - 'type' => Controls_Manager::COLOR, | |
| 365 | - 'selectors' => [ | |
| 366 | - '{{WRAPPER}} a' => 'color: {{VALUE}};', | |
| 275 | + 'name' => 'typography', | |
| 276 | + 'global' => [ | |
| 277 | + 'default' => Global_Typography::TYPOGRAPHY_TEXT, | |
| 367 | 278 | ], |
| 368 | 279 | ] |
| 369 | 280 | ); |
| 370 | 281 | |
| 371 | - $this->end_controls_tab(); | |
| 372 | - | |
| 373 | - $this->start_controls_tab( | |
| 374 | - 'colors_hover', | |
| 282 | + $this->add_group_control( | |
| 283 | + Group_Control_Text_Shadow::get_type(), | |
| 375 | 284 | [ |
| 376 | - 'label' => esc_html__( 'Hover', 'elementor' ), | |
| 285 | + 'name' => 'text_shadow', | |
| 286 | + 'selector' => '{{WRAPPER}}', | |
| 377 | 287 | ] |
| 378 | 288 | ); |
| 379 | 289 | |
| 380 | - $this->add_control( | |
| 381 | - 'link_hover_color', | |
| 382 | - [ | |
| 383 | - 'label' => esc_html__( 'Link Color', 'elementor' ), | |
| 384 | - 'type' => Controls_Manager::COLOR, | |
| 385 | - 'selectors' => [ | |
| 386 | - '{{WRAPPER}} a:hover, {{WRAPPER}} a:focus' => 'color: {{VALUE}};', | |
| 387 | - ], | |
| 388 | - ] | |
| 389 | - ); | |
| 390 | - | |
| 391 | - $this->add_control( | |
| 392 | - 'link_hover_color_transition_duration', | |
| 393 | - [ | |
| 394 | - 'label' => esc_html__( 'Transition Duration', 'elementor' ), | |
| 395 | - 'type' => Controls_Manager::SLIDER, | |
| 396 | - 'size_units' => [ 's', 'ms', 'custom' ], | |
| 397 | - 'default' => [ | |
| 398 | - 'unit' => 's', | |
| 399 | - ], | |
| 400 | - 'selectors' => [ | |
| 401 | - '{{WRAPPER}} a' => 'transition-duration: {{SIZE}}{{UNIT}};', | |
| 402 | - ], | |
| 403 | - ] | |
| 404 | - ); | |
| 405 | - | |
| 406 | - $this->end_controls_tab(); | |
| 407 | - | |
| 408 | - $this->end_controls_tabs(); | |
| 409 | - | |
| 410 | 290 | $this->end_controls_section(); |
| 411 | 291 | |
| 412 | 292 | $this->start_controls_section( |
| 413 | 293 | 'section_drop_cap', |
| @@ -522,9 +402,10 @@ | ||
| 522 | 402 | 'max' => 5, |
| 523 | 403 | ], |
| 524 | 404 | ], |
| 525 | 405 | 'selectors' => [ |
| 526 | - '{{WRAPPER}} .elementor-drop-cap' => 'margin-inline-end: {{SIZE}}{{UNIT}};', | |
| 406 | + 'body:not(.rtl) {{WRAPPER}} .elementor-drop-cap' => 'margin-right: {{SIZE}}{{UNIT}};', | |
| 407 | + 'body.rtl {{WRAPPER}} .elementor-drop-cap' => 'margin-left: {{SIZE}}{{UNIT}};', | |
| 527 | 408 | ], |
| 528 | 409 | ] |
| 529 | 410 | ); |
| 530 | 411 | |
| @@ -605,11 +486,10 @@ | ||
| 605 | 486 | ?> |
| 606 | 487 | <?php if ( $should_render_inline_editing ) { ?> |
| 607 | 488 | <div <?php $this->print_render_attribute_string( 'editor' ); ?>> |
| 608 | 489 | <?php } ?> |
| 609 | - <?php // PHPCS - DO NOT REMOVE THIS ECHO - THE MAIN TEXT OF A WIDGET SHOULD NOT BE ESCAPED! | |
| 610 | - echo $editor_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 611 | - ?> | |
| 490 | + <?php // PHPCS - the main text of a widget should not be escaped. | |
| 491 | + echo $editor_content; // phpcs:ignore WordPress.Security.EscapeOutput ?> | |
| 612 | 492 | <?php if ( $should_render_inline_editing ) { ?> |
| 613 | 493 | </div> |
| 614 | 494 | <?php } ?> |
| 615 | 495 | <?php |
| @@ -635,19 +515,8 @@ | ||
| 635 | 515 | * |
| 636 | 516 | * @since 2.9.0 |
| 637 | 517 | * @access protected |
| 638 | 518 | */ |
| 639 | - public function render_markdown(): string { | |
| 640 | - $editor_content = $this->get_settings_for_display( 'editor' ); | |
| 641 | - $editor_content = $this->parse_text_editor( $editor_content ); | |
| 642 | - | |
| 643 | - if ( empty( $editor_content ) ) { | |
| 644 | - return ''; | |
| 645 | - } | |
| 646 | - | |
| 647 | - return \Elementor\Modules\MarkdownRender\Html_To_Markdown::convert( $editor_content ); | |
| 648 | - } | |
| 649 | - | |
| 650 | 519 | protected function content_template() { |
| 651 | 520 | ?> |
| 652 | 521 | <# |
| 653 | 522 | if ( '' === settings.editor ) { |