| @@ -1,18 +1,17 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | namespace Elementor; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Core\Base\App; |
| 5 | -use Elementor\Core\Base\Elements_Iteration_Actions\Assets; | |
| 6 | -use Elementor\Core\Files\Fonts\Google_Font; | |
| 5 | +use Elementor\Core\Base\Document; | |
| 7 | 6 | use Elementor\Core\Frontend\Render_Mode_Manager; |
| 8 | 7 | use Elementor\Core\Responsive\Files\Frontend as FrontendFile; |
| 8 | +use Elementor\Core\Files\CSS\Global_CSS; | |
| 9 | 9 | use Elementor\Core\Files\CSS\Post as Post_CSS; |
| 10 | 10 | use Elementor\Core\Files\CSS\Post_Preview; |
| 11 | 11 | use Elementor\Core\Responsive\Responsive; |
| 12 | 12 | use Elementor\Core\Settings\Manager as SettingsManager; |
| 13 | 13 | use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager; |
| 14 | -use Elementor\Modules\FloatingButtons\Module; | |
| 15 | 14 | |
| 16 | 15 | if ( ! defined( 'ABSPATH' ) ) { |
| 17 | 16 | exit; // Exit if accessed directly. |
| 18 | 17 | } |
| @@ -32,13 +31,8 @@ | ||
| 32 | 31 | */ |
| 33 | 32 | const THE_CONTENT_FILTER_PRIORITY = 9; |
| 34 | 33 | |
| 35 | 34 | /** |
| 36 | - * The priority of the frontend enqueued styles. | |
| 37 | - */ | |
| 38 | - const ENQUEUED_STYLES_PRIORITY = 20; | |
| 39 | - | |
| 40 | - /** | |
| 41 | 35 | * Post ID. |
| 42 | 36 | * |
| 43 | 37 | * Holds the ID of the current post. |
| 44 | 38 | * |
| @@ -166,17 +160,22 @@ | ||
| 166 | 160 | add_action( 'template_redirect', [ $this, 'init' ] ); |
| 167 | 161 | add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ], 5 ); |
| 168 | 162 | add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 5 ); |
| 169 | 163 | |
| 164 | + // TODO: a temporary solution to a scenario that the elementor-icons.css file was de-registered and the e-icons font fonts should not be loaded. | |
| 165 | + add_action( 'wp_enqueue_scripts', function() { | |
| 166 | + if ( ! wp_style_is( 'elementor-icons', 'registered' ) ) { | |
| 167 | + $elementor_icons_css_reset = '[class^="eicon"], [class*=" eicon-"] { font-family: "initial"; } [class^="eicon"]:before, [class*=" eicon-"]:before { content: ""; }'; | |
| 168 | + | |
| 169 | + wp_add_inline_style( 'elementor-frontend', $elementor_icons_css_reset ); | |
| 170 | + } | |
| 171 | + }, 30 ); | |
| 172 | + | |
| 170 | 173 | $this->add_content_filter(); |
| 171 | 174 | |
| 172 | 175 | // Hack to avoid enqueue post CSS while it's a `the_excerpt` call. |
| 173 | 176 | add_filter( 'get_the_excerpt', [ $this, 'start_excerpt_flag' ], 1 ); |
| 174 | 177 | add_filter( 'get_the_excerpt', [ $this, 'end_excerpt_flag' ], 20 ); |
| 175 | - | |
| 176 | - if ( version_compare( get_bloginfo( 'version' ), '6.9', '>=' ) ) { | |
| 177 | - add_filter( 'wp_should_output_buffer_template_for_enhancement', '__return_false', 1 ); | |
| 178 | - } | |
| 179 | 178 | } |
| 180 | 179 | |
| 181 | 180 | /** |
| 182 | 181 | * Get module name. |
| @@ -233,9 +232,9 @@ | ||
| 233 | 232 | |
| 234 | 233 | $document = Plugin::$instance->documents->get( $this->post_id ); |
| 235 | 234 | |
| 236 | 235 | if ( is_singular() && $document && $document->is_built_with_elementor() ) { |
| 237 | - add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_styles' ], self::ENQUEUED_STYLES_PRIORITY ); | |
| 236 | + add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_styles' ] ); | |
| 238 | 237 | } |
| 239 | 238 | |
| 240 | 239 | // Priority 7 to allow google fonts in header template to load in <head> tag |
| 241 | 240 | add_action( 'wp_head', [ $this, 'print_fonts_links' ], 7 ); |
| @@ -245,15 +244,15 @@ | ||
| 245 | 244 | |
| 246 | 245 | /** |
| 247 | 246 | * @since 2.0.12 |
| 248 | 247 | * @access public |
| 249 | - * @param string|array $class_name | |
| 248 | + * @param string|array $class | |
| 250 | 249 | */ |
| 251 | - public function add_body_class( $class_name ) { | |
| 252 | - if ( is_array( $class_name ) ) { | |
| 253 | - $this->body_classes = array_merge( $this->body_classes, $class_name ); | |
| 250 | + public function add_body_class( $class ) { | |
| 251 | + if ( is_array( $class ) ) { | |
| 252 | + $this->body_classes = array_merge( $this->body_classes, $class ); | |
| 254 | 253 | } else { |
| 255 | - $this->body_classes[] = $class_name; | |
| 254 | + $this->body_classes[] = $class; | |
| 256 | 255 | } |
| 257 | 256 | } |
| 258 | 257 | |
| 259 | 258 | /** |
| @@ -263,13 +262,13 @@ | ||
| 263 | 262 | * @access public |
| 264 | 263 | */ |
| 265 | 264 | public function add_theme_color_meta_tag() { |
| 266 | 265 | $kit = Plugin::$instance->kits_manager->get_active_kit_for_frontend(); |
| 267 | - $mobile_theme_color = $kit->get_settings( 'mobile_browser_background' ); | |
| 266 | + $mobile_theme_color = $kit->get_settings( 'mobile_theme_color' ); | |
| 268 | 267 | |
| 269 | 268 | if ( ! empty( $mobile_theme_color ) ) { |
| 270 | 269 | ?> |
| 271 | - <meta name="theme-color" content="<?php echo esc_attr( $mobile_theme_color ); ?>"> | |
| 270 | + <meta name="theme-color" content="<?php echo $mobile_theme_color; ?>"> | |
| 272 | 271 | <?php |
| 273 | 272 | } |
| 274 | 273 | } |
| 275 | 274 | |
| @@ -376,12 +375,14 @@ | ||
| 376 | 375 | true |
| 377 | 376 | ); |
| 378 | 377 | |
| 379 | 378 | wp_register_script( |
| 380 | - 'swiper', | |
| 381 | - $this->get_js_assets_url( 'swiper', 'assets/lib/swiper/v8/' ), | |
| 382 | - [], | |
| 383 | - '8.4.5', | |
| 379 | + 'elementor-waypoints', | |
| 380 | + $this->get_js_assets_url( 'waypoints', 'assets/lib/waypoints/' ), | |
| 381 | + [ | |
| 382 | + 'jquery', | |
| 383 | + ], | |
| 384 | + '4.0.2', | |
| 384 | 385 | true |
| 385 | 386 | ); |
| 386 | 387 | |
| 387 | 388 | wp_register_script( |
| @@ -389,9 +390,9 @@ | ||
| 389 | 390 | $this->get_js_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 390 | 391 | [ |
| 391 | 392 | 'jquery', |
| 392 | 393 | ], |
| 393 | - '4.6.13', | |
| 394 | + '4.1.4', | |
| 394 | 395 | true |
| 395 | 396 | ); |
| 396 | 397 | |
| 397 | 398 | wp_register_script( |
| @@ -413,15 +414,28 @@ | ||
| 413 | 414 | '0.2.1', |
| 414 | 415 | true |
| 415 | 416 | ); |
| 416 | 417 | |
| 418 | + /** | |
| 419 | + * @deprecated since 2.7.0 Use Swiper instead | |
| 420 | + */ | |
| 417 | 421 | wp_register_script( |
| 422 | + 'jquery-slick', | |
| 423 | + $this->get_js_assets_url( 'slick', 'assets/lib/slick/' ), | |
| 424 | + [ | |
| 425 | + 'jquery', | |
| 426 | + ], | |
| 427 | + '1.8.1', | |
| 428 | + true | |
| 429 | + ); | |
| 430 | + | |
| 431 | + wp_register_script( | |
| 418 | 432 | 'elementor-dialog', |
| 419 | 433 | $this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ), |
| 420 | 434 | [ |
| 421 | 435 | 'jquery-ui-position', |
| 422 | 436 | ], |
| 423 | - '4.9.4', | |
| 437 | + '4.8.1', | |
| 424 | 438 | true |
| 425 | 439 | ); |
| 426 | 440 | |
| 427 | 441 | wp_register_script( |
| @@ -446,18 +460,13 @@ | ||
| 446 | 460 | |
| 447 | 461 | wp_register_script( |
| 448 | 462 | 'elementor-frontend', |
| 449 | 463 | $this->get_js_assets_url( 'frontend' ), |
| 450 | - [ | |
| 451 | - 'elementor-frontend-modules', | |
| 452 | - 'jquery-ui-position', | |
| 453 | - ], | |
| 464 | + $this->get_elementor_frontend_dependencies(), | |
| 454 | 465 | ELEMENTOR_VERSION, |
| 455 | 466 | true |
| 456 | 467 | ); |
| 457 | 468 | |
| 458 | - $this->register_frontend_handlers(); | |
| 459 | - | |
| 460 | 469 | /** |
| 461 | 470 | * After frontend register scripts. |
| 462 | 471 | * |
| 463 | 472 | * Fires after Elementor frontend scripts are registered. |
| @@ -477,12 +486,8 @@ | ||
| 477 | 486 | * @since 1.2.0 |
| 478 | 487 | * @access public |
| 479 | 488 | */ |
| 480 | 489 | public function register_styles() { |
| 481 | - $min_suffix = Utils::is_script_debug() ? '' : '.min'; | |
| 482 | - $direction_suffix = is_rtl() ? '-rtl' : ''; | |
| 483 | - $has_custom_breakpoints = Plugin::$instance->breakpoints->has_custom_breakpoints(); | |
| 484 | - | |
| 485 | 490 | /** |
| 486 | 491 | * Before frontend register styles. |
| 487 | 492 | * |
| 488 | 493 | * Fires before Elementor frontend styles are registered. |
| @@ -501,9 +506,9 @@ | ||
| 501 | 506 | wp_register_style( |
| 502 | 507 | 'elementor-icons', |
| 503 | 508 | $this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ), |
| 504 | 509 | [], |
| 505 | - Icons_Manager::ELEMENTOR_ICONS_VERSION | |
| 510 | + '5.11.0' | |
| 506 | 511 | ); |
| 507 | 512 | |
| 508 | 513 | wp_register_style( |
| 509 | 514 | 'flatpickr', |
| @@ -508,9 +513,9 @@ | ||
| 508 | 513 | wp_register_style( |
| 509 | 514 | 'flatpickr', |
| 510 | 515 | $this->get_css_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 511 | 516 | [], |
| 512 | - '4.6.13' | |
| 517 | + '4.1.4' | |
| 513 | 518 | ); |
| 514 | 519 | |
| 515 | 520 | wp_register_style( |
| 516 | 521 | 'elementor-gallery', |
| @@ -518,69 +523,52 @@ | ||
| 518 | 523 | [], |
| 519 | 524 | '1.2.0' |
| 520 | 525 | ); |
| 521 | 526 | |
| 522 | - wp_register_style( | |
| 523 | - 'e-apple-webkit', | |
| 524 | - $this->get_frontend_file_url( 'apple-webkit.min.css', $has_custom_breakpoints, 'conditionals/' ), | |
| 525 | - [], | |
| 526 | - $has_custom_breakpoints ? null : ELEMENTOR_VERSION | |
| 527 | - ); | |
| 527 | + $min_suffix = Utils::is_script_debug() ? '' : '.min'; | |
| 528 | 528 | |
| 529 | - wp_register_style( | |
| 530 | - 'e-swiper', | |
| 531 | - $this->get_css_assets_url( 'e-swiper', 'assets/css/conditionals/' ), | |
| 532 | - [ 'swiper' ], | |
| 533 | - ELEMENTOR_VERSION | |
| 534 | - ); | |
| 529 | + $direction_suffix = is_rtl() ? '-rtl' : ''; | |
| 535 | 530 | |
| 536 | - wp_register_style( | |
| 537 | - 'swiper', | |
| 538 | - $this->get_css_assets_url( 'swiper', 'assets/lib/swiper/v8/css/' ), | |
| 539 | - [], | |
| 540 | - '8.4.5' | |
| 541 | - ); | |
| 531 | + $frontend_base_file_name = $this->is_optimized_css_mode() ? 'frontend-lite' : 'frontend'; | |
| 542 | 532 | |
| 543 | - wp_register_style( | |
| 544 | - 'elementor-wp-admin-bar', | |
| 545 | - $this->get_css_assets_url( 'admin-bar', 'assets/css/' ), | |
| 546 | - [], | |
| 547 | - ELEMENTOR_VERSION | |
| 548 | - ); | |
| 533 | + $frontend_file_name = $frontend_base_file_name . $direction_suffix . $min_suffix . '.css'; | |
| 549 | 534 | |
| 550 | - wp_register_style( | |
| 551 | - 'e-lightbox', | |
| 552 | - $this->get_frontend_file_url( 'lightbox.min.css', $has_custom_breakpoints, 'conditionals/' ), | |
| 553 | - [], | |
| 554 | - $has_custom_breakpoints ? null : ELEMENTOR_VERSION | |
| 555 | - ); | |
| 535 | + $has_custom_file = Plugin::$instance->breakpoints->has_custom_breakpoints(); | |
| 556 | 536 | |
| 557 | - wp_register_style( | |
| 558 | - 'elementor-frontend', | |
| 559 | - $this->get_frontend_file_url( "frontend{$min_suffix}.css", $has_custom_breakpoints ), | |
| 560 | - [], | |
| 561 | - $has_custom_breakpoints ? null : ELEMENTOR_VERSION | |
| 562 | - ); | |
| 537 | + if ( $has_custom_file ) { | |
| 538 | + $frontend_file = new FrontendFile( 'custom-' . $frontend_file_name, Breakpoints_Manager::get_stylesheet_templates_path() . $frontend_file_name ); | |
| 563 | 539 | |
| 564 | - $widgets_with_styles = Plugin::$instance->widgets_manager->widgets_with_styles(); | |
| 565 | - foreach ( $widgets_with_styles as $widget_name ) { | |
| 540 | + $time = $frontend_file->get_meta( 'time' ); | |
| 541 | + | |
| 542 | + if ( ! $time ) { | |
| 543 | + $frontend_file->update(); | |
| 544 | + } | |
| 545 | + | |
| 546 | + $frontend_file_url = $frontend_file->get_url(); | |
| 547 | + } else { | |
| 548 | + $frontend_file_url = ELEMENTOR_ASSETS_URL . 'css/' . $frontend_file_name; | |
| 549 | + } | |
| 550 | + | |
| 551 | + $frontend_dependencies = []; | |
| 552 | + | |
| 553 | + if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { | |
| 554 | + // If The Dom Optimization feature is disabled, register the legacy CSS | |
| 566 | 555 | wp_register_style( |
| 567 | - "widget-{$widget_name}", | |
| 568 | - $this->get_css_assets_url( "widget-{$widget_name}", null, true, true ), | |
| 569 | - [ 'elementor-frontend' ], | |
| 556 | + 'elementor-frontend-legacy', | |
| 557 | + ELEMENTOR_ASSETS_URL . 'css/frontend-legacy' . $direction_suffix . $min_suffix . '.css', | |
| 558 | + [], | |
| 570 | 559 | ELEMENTOR_VERSION |
| 571 | 560 | ); |
| 561 | + | |
| 562 | + $frontend_dependencies[] = 'elementor-frontend-legacy'; | |
| 572 | 563 | } |
| 573 | 564 | |
| 574 | - $widgets_with_responsive_styles = Plugin::$instance->widgets_manager->widgets_with_responsive_styles(); | |
| 575 | - foreach ( $widgets_with_responsive_styles as $widget_name ) { | |
| 576 | - wp_register_style( | |
| 577 | - "widget-{$widget_name}", | |
| 578 | - $this->get_frontend_file_url( "widget-{$widget_name}{$direction_suffix}.min.css", $has_custom_breakpoints ), | |
| 579 | - [ 'elementor-frontend' ], | |
| 580 | - $has_custom_breakpoints ? null : ELEMENTOR_VERSION | |
| 581 | - ); | |
| 582 | - } | |
| 565 | + wp_register_style( | |
| 566 | + 'elementor-frontend', | |
| 567 | + $frontend_file_url, | |
| 568 | + $frontend_dependencies, | |
| 569 | + $has_custom_file ? null : ELEMENTOR_VERSION | |
| 570 | + ); | |
| 583 | 571 | |
| 584 | 572 | /** |
| 585 | 573 | * After frontend register styles. |
| 586 | 574 | * |
| @@ -591,23 +579,8 @@ | ||
| 591 | 579 | do_action( 'elementor/frontend/after_register_styles' ); |
| 592 | 580 | } |
| 593 | 581 | |
| 594 | 582 | /** |
| 595 | - * Register frontend handlers. | |
| 596 | - * | |
| 597 | - * Registers all the frontend handlers for widgets and elements. | |
| 598 | - * | |
| 599 | - * Fired by `wp_enqueue_scripts` action. | |
| 600 | - * | |
| 601 | - * @since 3.25.0 | |
| 602 | - * @access public | |
| 603 | - */ | |
| 604 | - public function register_frontend_handlers() { | |
| 605 | - Plugin::$instance->widgets_manager->register_frontend_handlers(); | |
| 606 | - Plugin::$instance->elements_manager->register_frontend_handlers(); | |
| 607 | - } | |
| 608 | - | |
| 609 | - /** | |
| 610 | 583 | * Enqueue scripts. |
| 611 | 584 | * |
| 612 | 585 | * Enqueue all the frontend scripts. |
| 613 | 586 | * |
| @@ -623,8 +596,22 @@ | ||
| 623 | 596 | * @since 1.0.0 |
| 624 | 597 | */ |
| 625 | 598 | do_action( 'elementor/frontend/before_enqueue_scripts' ); |
| 626 | 599 | |
| 600 | + wp_enqueue_script( 'elementor-frontend' ); | |
| 601 | + | |
| 602 | + if ( ! $this->is_improved_assets_loading() ) { | |
| 603 | + wp_enqueue_script( | |
| 604 | + 'preloaded-modules', | |
| 605 | + $this->get_js_assets_url( 'preloaded-modules', 'assets/js/' ), | |
| 606 | + [ | |
| 607 | + 'elementor-frontend', | |
| 608 | + ], | |
| 609 | + ELEMENTOR_VERSION, | |
| 610 | + true | |
| 611 | + ); | |
| 612 | + } | |
| 613 | + | |
| 627 | 614 | $this->print_config(); |
| 628 | 615 | |
| 629 | 616 | $this->enqueue_conditional_assets(); |
| 630 | 617 | |
| @@ -662,19 +649,17 @@ | ||
| 662 | 649 | * @since 1.0.0 |
| 663 | 650 | */ |
| 664 | 651 | do_action( 'elementor/frontend/before_enqueue_styles' ); |
| 665 | 652 | |
| 653 | + $this->add_elementor_icons_inline_css(); | |
| 654 | + | |
| 666 | 655 | // The e-icons are needed in preview mode for the editor icons (plus-icon for new section, folder-icon for the templates library etc.). |
| 667 | - if ( ! Plugin::$instance->experiments->is_feature_active( 'e_font_icon_svg' ) || Plugin::$instance->preview->is_preview_mode() ) { | |
| 656 | + if ( ! $this->is_improved_assets_loading() || Plugin::$instance->preview->is_preview_mode() ) { | |
| 668 | 657 | wp_enqueue_style( 'elementor-icons' ); |
| 669 | 658 | } |
| 670 | 659 | |
| 671 | 660 | wp_enqueue_style( 'elementor-frontend' ); |
| 672 | 661 | |
| 673 | - if ( is_admin_bar_showing() ) { | |
| 674 | - wp_enqueue_style( 'elementor-wp-admin-bar' ); | |
| 675 | - } | |
| 676 | - | |
| 677 | 662 | /** |
| 678 | 663 | * After frontend styles enqueued. |
| 679 | 664 | * |
| 680 | 665 | * Fires after Elementor frontend styles are enqueued. |
| @@ -683,138 +668,21 @@ | ||
| 683 | 668 | */ |
| 684 | 669 | do_action( 'elementor/frontend/after_enqueue_styles' ); |
| 685 | 670 | |
| 686 | 671 | if ( ! Plugin::$instance->preview->is_preview_mode() ) { |
| 672 | + $this->parse_global_css_code(); | |
| 673 | + | |
| 687 | 674 | $post_id = get_the_ID(); |
| 688 | 675 | // Check $post_id for virtual pages. check is singular because the $post_id is set to the first post on archive pages. |
| 689 | 676 | if ( $post_id && is_singular() ) { |
| 690 | - do_action( 'elementor/post/render', $post_id ); | |
| 691 | - $this->handle_page_assets( $post_id ); | |
| 692 | - | |
| 693 | 677 | $css_file = Post_CSS::create( get_the_ID() ); |
| 694 | 678 | $css_file->enqueue(); |
| 695 | 679 | } |
| 696 | - } else { | |
| 697 | - $post_id = Plugin::$instance->preview->get_post_id(); | |
| 698 | - if ( $post_id ) { | |
| 699 | - do_action( 'elementor/post/render', $post_id ); | |
| 700 | - } | |
| 701 | 680 | } |
| 702 | - | |
| 703 | - do_action( 'elementor/frontend/after_enqueue_post_styles' ); | |
| 704 | 681 | } |
| 705 | 682 | } |
| 706 | 683 | |
| 707 | - private function handle_page_assets( $post_id ): void { | |
| 708 | - $page_assets = get_post_meta( $post_id, Assets::ASSETS_META_KEY, true ); | |
| 709 | - if ( ! empty( $page_assets ) ) { | |
| 710 | - Plugin::$instance->assets_loader->enable_assets( $page_assets ); | |
| 711 | - return; | |
| 712 | - } | |
| 713 | - | |
| 714 | - $document = Plugin::$instance->documents->get( $post_id ); | |
| 715 | - | |
| 716 | - if ( ! $document ) { | |
| 717 | - return; | |
| 718 | - } | |
| 719 | - | |
| 720 | - $document->update_runtime_elements(); | |
| 721 | - } | |
| 722 | - | |
| 723 | 684 | /** |
| 724 | - * Get Frontend File URL | |
| 725 | - * | |
| 726 | - * Returns the URL for the CSS file to be loaded in the front end. If requested via the second parameter, a custom | |
| 727 | - * file is generated based on a passed template file name. Otherwise, the URL for the default CSS file is returned. | |
| 728 | - * | |
| 729 | - * @since 3.4.5 | |
| 730 | - * | |
| 731 | - * @access public | |
| 732 | - * | |
| 733 | - * @param string $frontend_file_name | |
| 734 | - * @param boolean $custom_file | |
| 735 | - * | |
| 736 | - * @return string frontend file URL | |
| 737 | - */ | |
| 738 | - public function get_frontend_file_url( $frontend_file_name, $custom_file, $css_subfolder = '' ) { | |
| 739 | - if ( $custom_file ) { | |
| 740 | - $frontend_file = $this->get_frontend_file( $frontend_file_name ); | |
| 741 | - | |
| 742 | - $frontend_file_url = $frontend_file->get_url(); | |
| 743 | - } else { | |
| 744 | - $frontend_file_url = ELEMENTOR_ASSETS_URL . 'css/' . $css_subfolder . $frontend_file_name; | |
| 745 | - } | |
| 746 | - | |
| 747 | - return $frontend_file_url; | |
| 748 | - } | |
| 749 | - | |
| 750 | - /** | |
| 751 | - * Get Frontend File Path | |
| 752 | - * | |
| 753 | - * Returns the path for the CSS file to be loaded in the front end. If requested via the second parameter, a custom | |
| 754 | - * file is generated based on a passed template file name. Otherwise, the path for the default CSS file is returned. | |
| 755 | - * | |
| 756 | - * @since 3.5.0 | |
| 757 | - * @access public | |
| 758 | - * | |
| 759 | - * @param string $frontend_file_name | |
| 760 | - * @param boolean $custom_file | |
| 761 | - * | |
| 762 | - * @return string frontend file path | |
| 763 | - */ | |
| 764 | - public function get_frontend_file_path( $frontend_file_name, $custom_file ) { | |
| 765 | - if ( $custom_file ) { | |
| 766 | - $frontend_file = $this->get_frontend_file( $frontend_file_name ); | |
| 767 | - | |
| 768 | - $frontend_file_path = $frontend_file->get_path(); | |
| 769 | - } else { | |
| 770 | - $frontend_file_path = ELEMENTOR_ASSETS_PATH . 'css/' . $frontend_file_name; | |
| 771 | - } | |
| 772 | - | |
| 773 | - return $frontend_file_path; | |
| 774 | - } | |
| 775 | - | |
| 776 | - /** | |
| 777 | - * Get Frontend File | |
| 778 | - * | |
| 779 | - * Returns a frontend file instance. | |
| 780 | - * | |
| 781 | - * @since 3.5.0 | |
| 782 | - * @access public | |
| 783 | - * | |
| 784 | - * @param string $frontend_file_name | |
| 785 | - * @param string $file_prefix | |
| 786 | - * @param string $template_file_path | |
| 787 | - * | |
| 788 | - * @return FrontendFile | |
| 789 | - */ | |
| 790 | - public function get_frontend_file( $frontend_file_name, $file_prefix = 'custom-', $template_file_path = '' ) { | |
| 791 | - static $cached_frontend_files = []; | |
| 792 | - | |
| 793 | - $file_name = $file_prefix . $frontend_file_name; | |
| 794 | - | |
| 795 | - if ( isset( $cached_frontend_files[ $file_name ] ) ) { | |
| 796 | - return $cached_frontend_files[ $file_name ]; | |
| 797 | - } | |
| 798 | - | |
| 799 | - if ( ! $template_file_path ) { | |
| 800 | - $template_file_path = Breakpoints_Manager::get_stylesheet_templates_path() . $frontend_file_name; | |
| 801 | - } | |
| 802 | - | |
| 803 | - $frontend_file = new FrontendFile( $file_name, $template_file_path ); | |
| 804 | - | |
| 805 | - $time = $frontend_file->get_meta( 'time' ); | |
| 806 | - | |
| 807 | - if ( ! $time ) { | |
| 808 | - $frontend_file->update(); | |
| 809 | - } | |
| 810 | - | |
| 811 | - $cached_frontend_files[ $file_name ] = $frontend_file; | |
| 812 | - | |
| 813 | - return $frontend_file; | |
| 814 | - } | |
| 815 | - | |
| 816 | - /** | |
| 817 | 685 | * Enqueue assets conditionally. |
| 818 | 686 | * |
| 819 | 687 | * Enqueue all assets that were pre-enabled. |
| 820 | 688 | * |
| @@ -846,11 +714,18 @@ | ||
| 846 | 714 | $this->print_fonts_links(); |
| 847 | 715 | } |
| 848 | 716 | |
| 849 | 717 | /** |
| 850 | - * @return array|array[] | |
| 718 | + * Print fonts links. | |
| 719 | + * | |
| 720 | + * Enqueue all the frontend fonts by url. | |
| 721 | + * | |
| 722 | + * Fired by `wp_head` action. | |
| 723 | + * | |
| 724 | + * @since 1.9.4 | |
| 725 | + * @access public | |
| 851 | 726 | */ |
| 852 | - public function get_list_of_google_fonts_by_type(): array { | |
| 727 | + public function print_fonts_links() { | |
| 853 | 728 | $google_fonts = [ |
| 854 | 729 | 'google' => [], |
| 855 | 730 | 'early' => [], |
| 856 | 731 | ]; |
| @@ -886,36 +761,8 @@ | ||
| 886 | 761 | } |
| 887 | 762 | } |
| 888 | 763 | $this->fonts_to_enqueue = []; |
| 889 | 764 | |
| 890 | - return $google_fonts; | |
| 891 | - } | |
| 892 | - | |
| 893 | - /** | |
| 894 | - * Print fonts links. | |
| 895 | - * | |
| 896 | - * Enqueue all the frontend fonts by url. | |
| 897 | - * | |
| 898 | - * Fired by `wp_head` action. | |
| 899 | - * | |
| 900 | - * @since 1.9.4 | |
| 901 | - * @access public | |
| 902 | - */ | |
| 903 | - public function print_fonts_links() { | |
| 904 | - /** | |
| 905 | - * Register font styles. | |
| 906 | - * | |
| 907 | - * Fires before fonts are processed, allowing add-ons to register | |
| 908 | - * proper stylesheets for their custom font types via the WordPress API. | |
| 909 | - * | |
| 910 | - * @since 3.29.0 | |
| 911 | - * | |
| 912 | - * @param string[] $fonts_to_enqueue List of font families to be enqueued. | |
| 913 | - */ | |
| 914 | - do_action( 'elementor/fonts/register_styles', $this->fonts_to_enqueue ); | |
| 915 | - | |
| 916 | - $google_fonts = $this->get_list_of_google_fonts_by_type(); | |
| 917 | - | |
| 918 | 765 | $this->enqueue_google_fonts( $google_fonts ); |
| 919 | 766 | $this->enqueue_icon_fonts(); |
| 920 | 767 | } |
| 921 | 768 | |
| @@ -944,78 +791,13 @@ | ||
| 944 | 791 | wp_enqueue_style( 'elementor-icons-' . $icon_type ); |
| 945 | 792 | $this->enqueued_icon_fonts[] = $css_url; |
| 946 | 793 | } |
| 947 | 794 | |
| 948 | - // Clear enqueued icons. | |
| 795 | + //clear enqueued icons | |
| 949 | 796 | $this->icon_fonts_to_enqueue = []; |
| 950 | 797 | } |
| 951 | 798 | |
| 952 | 799 | /** |
| 953 | - * @param array $fonts Stable google fonts ($google_fonts['google']). | |
| 954 | - * @return string | |
| 955 | - */ | |
| 956 | - public function get_stable_google_fonts_url( array $fonts ): string { | |
| 957 | - foreach ( $fonts as &$font ) { | |
| 958 | - $font = str_replace( ' ', '+', $font ) . ':100,100italic,200,200italic,300,300italic,400,400italic,500,500italic,600,600italic,700,700italic,800,800italic,900,900italic'; | |
| 959 | - } | |
| 960 | - | |
| 961 | - // Defining a font-display type to google fonts. | |
| 962 | - $font_display_url_str = '&display=' . Fonts::get_font_display_setting(); | |
| 963 | - | |
| 964 | - $fonts_url = sprintf( 'https://fonts.googleapis.com/css?family=%1$s%2$s', implode( rawurlencode( '|' ), $fonts ), $font_display_url_str ); | |
| 965 | - | |
| 966 | - $subsets = [ | |
| 967 | - 'ru_RU' => 'cyrillic', | |
| 968 | - 'bg_BG' => 'cyrillic', | |
| 969 | - 'he_IL' => 'hebrew', | |
| 970 | - 'el' => 'greek', | |
| 971 | - 'vi' => 'vietnamese', | |
| 972 | - 'uk' => 'cyrillic', | |
| 973 | - 'cs_CZ' => 'latin-ext', | |
| 974 | - 'ro_RO' => 'latin-ext', | |
| 975 | - 'pl_PL' => 'latin-ext', | |
| 976 | - 'hr_HR' => 'latin-ext', | |
| 977 | - 'hu_HU' => 'latin-ext', | |
| 978 | - 'sk_SK' => 'latin-ext', | |
| 979 | - 'tr_TR' => 'latin-ext', | |
| 980 | - 'lt_LT' => 'latin-ext', | |
| 981 | - ]; | |
| 982 | - | |
| 983 | - /** | |
| 984 | - * Google font subsets. | |
| 985 | - * | |
| 986 | - * Filters the list of Google font subsets from which locale will be enqueued in frontend. | |
| 987 | - * | |
| 988 | - * @since 1.0.0 | |
| 989 | - * | |
| 990 | - * @param array $subsets A list of font subsets. | |
| 991 | - */ | |
| 992 | - $subsets = apply_filters( 'elementor/frontend/google_font_subsets', $subsets ); | |
| 993 | - | |
| 994 | - $locale = get_locale(); | |
| 995 | - | |
| 996 | - if ( isset( $subsets[ $locale ] ) ) { | |
| 997 | - $fonts_url .= '&subset=' . $subsets[ $locale ]; | |
| 998 | - } | |
| 999 | - | |
| 1000 | - return $fonts_url; | |
| 1001 | - } | |
| 1002 | - | |
| 1003 | - /** | |
| 1004 | - * @param array $fonts Early Access google fonts ($google_fonts['early']). | |
| 1005 | - * @return array | |
| 1006 | - */ | |
| 1007 | - public function get_early_access_google_font_urls( array $fonts ): array { | |
| 1008 | - $font_urls = []; | |
| 1009 | - | |
| 1010 | - foreach ( $fonts as $font ) { | |
| 1011 | - $font_urls[] = sprintf( 'https://fonts.googleapis.com/earlyaccess/%s.css', strtolower( str_replace( ' ', '', $font ) ) ); | |
| 1012 | - } | |
| 1013 | - | |
| 1014 | - return $font_urls; | |
| 1015 | - } | |
| 1016 | - | |
| 1017 | - /** | |
| 1018 | 800 | * Print Google fonts. |
| 1019 | 801 | * |
| 1020 | 802 | * Enqueue all the frontend Google fonts. |
| 1021 | 803 | * |
| @@ -1027,10 +809,12 @@ | ||
| 1027 | 809 | * @param array $google_fonts Optional. Google fonts to print in the frontend. |
| 1028 | 810 | * Default is an empty array. |
| 1029 | 811 | */ |
| 1030 | 812 | private function enqueue_google_fonts( $google_fonts = [] ) { |
| 1031 | - $print_google_fonts = Fonts::is_google_fonts_enabled(); | |
| 813 | + static $google_fonts_index = 0; | |
| 1032 | 814 | |
| 815 | + $print_google_fonts = true; | |
| 816 | + | |
| 1033 | 817 | /** |
| 1034 | 818 | * Print frontend google fonts. |
| 1035 | 819 | * |
| 1036 | 820 | * Filters whether to enqueue Google fonts in the frontend. |
| @@ -1044,21 +828,61 @@ | ||
| 1044 | 828 | if ( ! $print_google_fonts ) { |
| 1045 | 829 | return; |
| 1046 | 830 | } |
| 1047 | 831 | |
| 1048 | - $force_enqueue_from_cdn = Plugin::$instance->preview->is_preview_mode(); | |
| 832 | + // Print used fonts | |
| 833 | + if ( ! empty( $google_fonts['google'] ) ) { | |
| 834 | + $google_fonts_index++; | |
| 1049 | 835 | |
| 1050 | - if ( ! empty( $google_fonts['google'] ) ) { | |
| 1051 | - foreach ( $google_fonts['google'] as $current_font ) { | |
| 1052 | - Google_Font::enqueue( $current_font, Google_Font::TYPE_DEFAULT, $force_enqueue_from_cdn ); | |
| 836 | + foreach ( $google_fonts['google'] as &$font ) { | |
| 837 | + $font = str_replace( ' ', '+', $font ) . ':100,100italic,200,200italic,300,300italic,400,400italic,500,500italic,600,600italic,700,700italic,800,800italic,900,900italic'; | |
| 1053 | 838 | } |
| 839 | + | |
| 840 | + // Defining a font-display type to google fonts. | |
| 841 | + $font_display_url_str = '&display=' . Fonts::get_font_display_setting(); | |
| 842 | + | |
| 843 | + $fonts_url = sprintf( 'https://fonts.googleapis.com/css?family=%1$s%2$s', implode( rawurlencode( '|' ), $google_fonts['google'] ), $font_display_url_str ); | |
| 844 | + | |
| 845 | + $subsets = [ | |
| 846 | + 'ru_RU' => 'cyrillic', | |
| 847 | + 'bg_BG' => 'cyrillic', | |
| 848 | + 'he_IL' => 'hebrew', | |
| 849 | + 'el' => 'greek', | |
| 850 | + 'vi' => 'vietnamese', | |
| 851 | + 'uk' => 'cyrillic', | |
| 852 | + 'cs_CZ' => 'latin-ext', | |
| 853 | + 'ro_RO' => 'latin-ext', | |
| 854 | + 'pl_PL' => 'latin-ext', | |
| 855 | + 'hr_HR' => 'latin-ext', | |
| 856 | + 'hu_HU' => 'latin-ext', | |
| 857 | + 'sk_SK' => 'latin-ext', | |
| 858 | + 'tr_TR' => 'latin-ext', | |
| 859 | + 'lt_LT' => 'latin-ext', | |
| 860 | + ]; | |
| 861 | + | |
| 862 | + $subsets = apply_filters( 'elementor/frontend/google_font_subsets', $subsets ); | |
| 863 | + | |
| 864 | + $locale = get_locale(); | |
| 865 | + | |
| 866 | + if ( isset( $subsets[ $locale ] ) ) { | |
| 867 | + $fonts_url .= '&subset=' . $subsets[ $locale ]; | |
| 868 | + } | |
| 869 | + | |
| 870 | + wp_enqueue_style( 'google-fonts-' . $google_fonts_index, $fonts_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1054 | 871 | } |
| 1055 | 872 | |
| 1056 | 873 | if ( ! empty( $google_fonts['early'] ) ) { |
| 1057 | 874 | foreach ( $google_fonts['early'] as $current_font ) { |
| 1058 | - Google_Font::enqueue( $current_font, Google_Font::TYPE_EARLYACCESS, $force_enqueue_from_cdn ); | |
| 875 | + $google_fonts_index++; | |
| 876 | + | |
| 877 | + //printf( '<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/earlyaccess/%s.css">', strtolower( str_replace( ' ', '', $current_font ) ) ); | |
| 878 | + | |
| 879 | + $font_url = sprintf( 'https://fonts.googleapis.com/earlyaccess/%s.css', strtolower( str_replace( ' ', '', $current_font ) ) ); | |
| 880 | + | |
| 881 | + wp_enqueue_style( 'google-earlyaccess-' . $google_fonts_index, $font_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1059 | 882 | } |
| 1060 | 883 | } |
| 884 | + | |
| 1061 | 885 | } |
| 1062 | 886 | |
| 1063 | 887 | /** |
| 1064 | 888 | * Enqueue fonts. |
| @@ -1079,8 +903,22 @@ | ||
| 1079 | 903 | $this->registered_fonts[] = $font; |
| 1080 | 904 | } |
| 1081 | 905 | |
| 1082 | 906 | /** |
| 907 | + * Parse global CSS. | |
| 908 | + * | |
| 909 | + * Enqueue the global CSS file. | |
| 910 | + * | |
| 911 | + * @since 1.2.0 | |
| 912 | + * @access protected | |
| 913 | + */ | |
| 914 | + protected function parse_global_css_code() { | |
| 915 | + $scheme_css_file = Global_CSS::create( 'global.css' ); | |
| 916 | + | |
| 917 | + $scheme_css_file->enqueue(); | |
| 918 | + } | |
| 919 | + | |
| 920 | + /** | |
| 1083 | 921 | * Apply builder in content. |
| 1084 | 922 | * |
| 1085 | 923 | * Used to apply the Elementor page editor on the post content. |
| 1086 | 924 | * |
| @@ -1147,21 +985,8 @@ | ||
| 1147 | 985 | |
| 1148 | 986 | $data = $document->get_elements_data(); |
| 1149 | 987 | |
| 1150 | 988 | /** |
| 1151 | - * Filters document elements data after loading. | |
| 1152 | - * | |
| 1153 | - * Allows modification of elements data when loading (not saving). | |
| 1154 | - * Useful for migrations, transformations, or data enrichment. | |
| 1155 | - * | |
| 1156 | - * @since 4.0.0 | |
| 1157 | - * | |
| 1158 | - * @param array $data The elements data array. | |
| 1159 | - * @param \Elementor\Core\Base\Document $document The document instance. | |
| 1160 | - */ | |
| 1161 | - $data = apply_filters( 'elementor/document/load/data', $data, $document ); | |
| 1162 | - | |
| 1163 | - /** | |
| 1164 | 989 | * Frontend builder content data. |
| 1165 | 990 | * |
| 1166 | 991 | * Filters the builder content in the frontend. |
| 1167 | 992 | * |
| @@ -1186,17 +1011,8 @@ | ||
| 1186 | 1011 | } else { |
| 1187 | 1012 | $css_file = Post_CSS::create( $post_id ); |
| 1188 | 1013 | } |
| 1189 | 1014 | |
| 1190 | - /** | |
| 1191 | - * Builder Content - Before Enqueue CSS File | |
| 1192 | - * | |
| 1193 | - * Allows intervening with a document's CSS file before it is enqueued. | |
| 1194 | - * | |
| 1195 | - * @param $css_file Post_CSS|Post_Preview | |
| 1196 | - */ | |
| 1197 | - $css_file = apply_filters( 'elementor/frontend/builder_content/before_enqueue_css_file', $css_file ); | |
| 1198 | - | |
| 1199 | 1015 | $css_file->enqueue(); |
| 1200 | 1016 | } |
| 1201 | 1017 | |
| 1202 | 1018 | ob_start(); |
| @@ -1205,18 +1021,8 @@ | ||
| 1205 | 1021 | if ( is_customize_preview() || wp_doing_ajax() ) { |
| 1206 | 1022 | $with_css = true; |
| 1207 | 1023 | } |
| 1208 | 1024 | |
| 1209 | - /** | |
| 1210 | - * Builder Content - With CSS | |
| 1211 | - * | |
| 1212 | - * Allows overriding the `$with_css` parameter which is a factor in determining whether to print the document's | |
| 1213 | - * CSS and font links inline in a `style` tag above the document's markup. | |
| 1214 | - * | |
| 1215 | - * @param $with_css boolean | |
| 1216 | - */ | |
| 1217 | - $with_css = apply_filters( 'elementor/frontend/builder_content/before_print_css', $with_css ); | |
| 1218 | - | |
| 1219 | 1025 | if ( ! empty( $css_file ) && $with_css ) { |
| 1220 | 1026 | $css_file->print_css(); |
| 1221 | 1027 | } |
| 1222 | 1028 | |
| @@ -1257,9 +1063,9 @@ | ||
| 1257 | 1063 | * |
| 1258 | 1064 | * @since 1.0.0 |
| 1259 | 1065 | * @access public |
| 1260 | 1066 | * |
| 1261 | - * @param int $post_id The post ID. | |
| 1067 | + * @param int $post_id The post ID. | |
| 1262 | 1068 | * |
| 1263 | 1069 | * @param bool $with_css Optional. Whether to retrieve the content with CSS |
| 1264 | 1070 | * or not. Default is false. |
| 1265 | 1071 | * |
| @@ -1275,9 +1081,9 @@ | ||
| 1275 | 1081 | // Avoid recursion |
| 1276 | 1082 | if ( get_the_ID() === (int) $post_id ) { |
| 1277 | 1083 | $content = ''; |
| 1278 | 1084 | if ( $editor->is_edit_mode() ) { |
| 1279 | - $content = '<div class="elementor-alert elementor-alert-danger">' . esc_html__( 'Invalid Data: The Template ID cannot be the same as the currently edited template. Please choose a different one.', 'elementor' ) . '</div>'; | |
| 1085 | + $content = '<div class="elementor-alert elementor-alert-danger">' . __( 'Invalid Data: The Template ID cannot be the same as the currently edited template. Please choose a different one.', 'elementor' ) . '</div>'; | |
| 1280 | 1086 | } |
| 1281 | 1087 | |
| 1282 | 1088 | return $content; |
| 1283 | 1089 | } |
| @@ -1404,21 +1210,8 @@ | ||
| 1404 | 1210 | $active_experimental_features = Plugin::$instance->experiments->get_active_features(); |
| 1405 | 1211 | |
| 1406 | 1212 | $active_experimental_features = array_fill_keys( array_keys( $active_experimental_features ), true ); |
| 1407 | 1213 | |
| 1408 | - $assets_url = ELEMENTOR_ASSETS_URL; | |
| 1409 | - | |
| 1410 | - /** | |
| 1411 | - * Frontend assets URL | |
| 1412 | - * | |
| 1413 | - * Filters Elementor frontend assets URL. | |
| 1414 | - * | |
| 1415 | - * @since 2.3.0 | |
| 1416 | - * | |
| 1417 | - * @param string $assets_url The frontend assets URL. Default is ELEMENTOR_ASSETS_URL. | |
| 1418 | - */ | |
| 1419 | - $assets_url = apply_filters( 'elementor/frontend/assets_url', $assets_url ); | |
| 1420 | - | |
| 1421 | 1214 | $settings = [ |
| 1422 | 1215 | 'environmentMode' => [ |
| 1423 | 1216 | 'edit' => $is_preview_mode, |
| 1424 | 1217 | 'wpPreview' => is_preview(), |
| @@ -1424,25 +1217,20 @@ | ||
| 1424 | 1217 | 'wpPreview' => is_preview(), |
| 1425 | 1218 | 'isScriptDebug' => Utils::is_script_debug(), |
| 1426 | 1219 | ], |
| 1427 | 1220 | 'i18n' => [ |
| 1428 | - 'shareOnFacebook' => esc_html__( 'Share on Facebook', 'elementor' ), | |
| 1429 | - 'shareOnTwitter' => esc_html__( 'Share on Twitter', 'elementor' ), | |
| 1430 | - 'pinIt' => esc_html__( 'Pin it', 'elementor' ), | |
| 1431 | - 'download' => esc_html__( 'Download', 'elementor' ), | |
| 1432 | - 'downloadImage' => esc_html__( 'Download image', 'elementor' ), | |
| 1433 | - 'fullscreen' => esc_html__( 'Fullscreen', 'elementor' ), | |
| 1434 | - 'zoom' => esc_html__( 'Zoom', 'elementor' ), | |
| 1435 | - 'share' => esc_html__( 'Share', 'elementor' ), | |
| 1436 | - 'playVideo' => esc_html__( 'Play Video', 'elementor' ), | |
| 1437 | - 'previous' => esc_html__( 'Previous', 'elementor' ), | |
| 1438 | - 'next' => esc_html__( 'Next', 'elementor' ), | |
| 1439 | - 'close' => esc_html__( 'Close', 'elementor' ), | |
| 1440 | - 'a11yCarouselPrevSlideMessage' => __( 'Previous slide', 'elementor' ), | |
| 1441 | - 'a11yCarouselNextSlideMessage' => __( 'Next slide', 'elementor' ), | |
| 1442 | - 'a11yCarouselFirstSlideMessage' => __( 'This is the first slide', 'elementor' ), | |
| 1443 | - 'a11yCarouselLastSlideMessage' => __( 'This is the last slide', 'elementor' ), | |
| 1444 | - 'a11yCarouselPaginationBulletMessage' => __( 'Go to slide', 'elementor' ), | |
| 1221 | + 'shareOnFacebook' => __( 'Share on Facebook', 'elementor' ), | |
| 1222 | + 'shareOnTwitter' => __( 'Share on Twitter', 'elementor' ), | |
| 1223 | + 'pinIt' => __( 'Pin it', 'elementor' ), | |
| 1224 | + 'download' => __( 'Download', 'elementor' ), | |
| 1225 | + 'downloadImage' => __( 'Download image', 'elementor' ), | |
| 1226 | + 'fullscreen' => __( 'Fullscreen', 'elementor' ), | |
| 1227 | + 'zoom' => __( 'Zoom', 'elementor' ), | |
| 1228 | + 'share' => __( 'Share', 'elementor' ), | |
| 1229 | + 'playVideo' => __( 'Play Video', 'elementor' ), | |
| 1230 | + 'previous' => __( 'Previous', 'elementor' ), | |
| 1231 | + 'next' => __( 'Next', 'elementor' ), | |
| 1232 | + 'close' => __( 'Close', 'elementor' ), | |
| 1445 | 1233 | ], |
| 1446 | 1234 | 'is_rtl' => is_rtl(), |
| 1447 | 1235 | // 'breakpoints' object is kept for BC. |
| 1448 | 1236 | 'breakpoints' => Responsive::get_breakpoints(), |
| @@ -1447,24 +1235,16 @@ | ||
| 1447 | 1235 | // 'breakpoints' object is kept for BC. |
| 1448 | 1236 | 'breakpoints' => Responsive::get_breakpoints(), |
| 1449 | 1237 | // 'responsive' contains the custom breakpoints config introduced in Elementor v3.2.0 |
| 1450 | 1238 | 'responsive' => [ |
| 1451 | - 'breakpoints' => Plugin::$instance->breakpoints->get_breakpoints_config(), | |
| 1452 | - 'hasCustomBreakpoints' => Plugin::$instance->breakpoints->has_custom_breakpoints(), | |
| 1239 | + 'breakpoints' => $this->get_breakpoints_config(), | |
| 1453 | 1240 | ], |
| 1454 | 1241 | 'version' => ELEMENTOR_VERSION, |
| 1455 | 1242 | 'is_static' => $this->is_static_render_mode(), |
| 1456 | 1243 | 'experimentalFeatures' => $active_experimental_features, |
| 1457 | 1244 | 'urls' => [ |
| 1458 | - 'assets' => $assets_url, | |
| 1459 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), | |
| 1460 | - 'uploadUrl' => wp_upload_dir()['baseurl'], | |
| 1245 | + 'assets' => apply_filters( 'elementor/frontend/assets_url', ELEMENTOR_ASSETS_URL ), | |
| 1461 | 1246 | ], |
| 1462 | - 'nonces' => [ | |
| 1463 | - 'floatingButtonsClickTracking' => wp_create_nonce( Module::CLICK_TRACKING_NONCE ), | |
| 1464 | - 'atomicFormsSendForm' => wp_create_nonce( 'elementor_pro_atomic_forms_send_form' ), | |
| 1465 | - ], | |
| 1466 | - 'swiperClass' => 'swiper', | |
| 1467 | 1247 | ]; |
| 1468 | 1248 | |
| 1469 | 1249 | $settings['settings'] = SettingsManager::get_settings_frontend_config(); |
| 1470 | 1250 | |
| @@ -1522,8 +1302,26 @@ | ||
| 1522 | 1302 | |
| 1523 | 1303 | return $settings; |
| 1524 | 1304 | } |
| 1525 | 1305 | |
| 1306 | + private function get_breakpoints_config() { | |
| 1307 | + $breakpoints = Plugin::$instance->breakpoints->get_breakpoints(); | |
| 1308 | + | |
| 1309 | + $config = []; | |
| 1310 | + | |
| 1311 | + foreach ( $breakpoints as $breakpoint_name => $breakpoint ) { | |
| 1312 | + $config[ $breakpoint_name ] = [ | |
| 1313 | + 'label' => $breakpoint->get_label(), | |
| 1314 | + 'value' => $breakpoint->get_value(), | |
| 1315 | + 'direction' => $breakpoint->get_direction(), | |
| 1316 | + 'is_enabled' => $breakpoint->is_enabled(), | |
| 1317 | + 'default_value' => $breakpoint->get_default_value(), | |
| 1318 | + ]; | |
| 1319 | + } | |
| 1320 | + | |
| 1321 | + return $config; | |
| 1322 | + } | |
| 1323 | + | |
| 1526 | 1324 | /** |
| 1527 | 1325 | * Restore content filters. |
| 1528 | 1326 | * |
| 1529 | 1327 | * Restore removed WordPress filters that conflicted with Elementor. |
| @@ -1546,9 +1344,9 @@ | ||
| 1546 | 1344 | * |
| 1547 | 1345 | * @access private |
| 1548 | 1346 | * @since 2.0.4 |
| 1549 | 1347 | * |
| 1550 | - * @param string $content | |
| 1348 | + * @param $content | |
| 1551 | 1349 | * |
| 1552 | 1350 | * @return string |
| 1553 | 1351 | */ |
| 1554 | 1352 | private function process_more_tag( $content ) { |
| @@ -1563,15 +1361,15 @@ | ||
| 1563 | 1361 | return $parts['main'] . '<div id="more-' . $post->ID . '"></div>' . $parts['extended']; |
| 1564 | 1362 | } |
| 1565 | 1363 | |
| 1566 | 1364 | if ( empty( $parts['more_text'] ) ) { |
| 1567 | - $parts['more_text'] = esc_html__( '(more…)', 'elementor' ); | |
| 1365 | + $parts['more_text'] = __( '(more…)', 'elementor' ); | |
| 1568 | 1366 | } |
| 1569 | 1367 | |
| 1570 | 1368 | $more_link_text = sprintf( |
| 1571 | 1369 | '<span aria-label="%1$s">%2$s</span>', |
| 1572 | 1370 | sprintf( |
| 1573 | - /* translators: %s: Current post name. */ | |
| 1371 | + /* translators: %s: Name of current post */ | |
| 1574 | 1372 | __( 'Continue reading %s', 'elementor' ), |
| 1575 | 1373 | the_title_attribute( [ |
| 1576 | 1374 | 'echo' => false, |
| 1577 | 1375 | ] ) |
| @@ -1578,24 +1376,57 @@ | ||
| 1578 | 1376 | ), |
| 1579 | 1377 | $parts['more_text'] |
| 1580 | 1378 | ); |
| 1581 | 1379 | |
| 1582 | - $more_link = sprintf( ' <a href="%s#more-%s" class="more-link elementor-more-link">%s</a>', get_permalink(), $post->ID, $more_link_text ); | |
| 1380 | + $more_link = apply_filters( 'the_content_more_link', sprintf( ' <a href="%s#more-%s" class="more-link elementor-more-link">%s</a>', get_permalink(), $post->ID, $more_link_text ), $more_link_text ); | |
| 1583 | 1381 | |
| 1382 | + return force_balance_tags( $parts['main'] ) . $more_link; | |
| 1383 | + } | |
| 1384 | + | |
| 1385 | + private function is_improved_assets_loading() { | |
| 1386 | + return Plugin::$instance->experiments->is_feature_active( 'e_optimized_assets_loading' ); | |
| 1387 | + } | |
| 1388 | + | |
| 1389 | + private function get_elementor_frontend_dependencies() { | |
| 1390 | + $dependencies = [ | |
| 1391 | + 'elementor-frontend-modules', | |
| 1392 | + 'elementor-waypoints', | |
| 1393 | + 'jquery-ui-position', | |
| 1394 | + ]; | |
| 1395 | + | |
| 1396 | + if ( ! $this->is_improved_assets_loading() ) { | |
| 1397 | + wp_register_script( | |
| 1398 | + 'swiper', | |
| 1399 | + $this->get_js_assets_url( 'swiper', 'assets/lib/swiper/' ), | |
| 1400 | + [], | |
| 1401 | + '5.3.6', | |
| 1402 | + true | |
| 1403 | + ); | |
| 1404 | + | |
| 1405 | + $dependencies[] = 'swiper'; | |
| 1406 | + $dependencies[] = 'share-link'; | |
| 1407 | + $dependencies[] = 'elementor-dialog'; | |
| 1408 | + } | |
| 1409 | + | |
| 1410 | + return $dependencies; | |
| 1411 | + } | |
| 1412 | + | |
| 1413 | + private function is_optimized_css_mode() { | |
| 1414 | + $is_optimized_css_loading = Plugin::$instance->experiments->is_feature_active( 'e_optimized_css_loading' ); | |
| 1415 | + | |
| 1416 | + return ! Utils::is_script_debug() && $is_optimized_css_loading && ! Plugin::$instance->preview->is_preview_mode(); | |
| 1417 | + } | |
| 1418 | + | |
| 1419 | + private function add_elementor_icons_inline_css() { | |
| 1420 | + $elementor_icons_library_version = '5.10.0'; | |
| 1421 | + | |
| 1584 | 1422 | /** |
| 1585 | - * The content "more" link. | |
| 1586 | - * | |
| 1587 | - * Filters the "more" link displayed after the content. | |
| 1588 | - * | |
| 1589 | - * This hook can be used either to change the link syntax or to change the | |
| 1590 | - * text inside the link. | |
| 1591 | - * | |
| 1592 | - * @since 2.0.4 | |
| 1593 | - * | |
| 1594 | - * @param string $more_link The more link. | |
| 1595 | - * @param string $more_link_text The text inside the more link. | |
| 1423 | + * The e-icons font-face must be printed inline due to custom breakpoints. | |
| 1424 | + * When using custom breakpoints, the frontend CSS is loaded from the custom-frontend CSS file. | |
| 1425 | + * The custom frontend file is located in a different path ('uploads' folder). | |
| 1426 | + * Therefore, it cannot be called from a CSS file that its relative path can vary. | |
| 1596 | 1427 | */ |
| 1597 | - $more_link = apply_filters( 'the_content_more_link', $more_link, $more_link_text ); | |
| 1428 | + $elementor_icons_inline_css = sprintf( '@font-face{font-family:eicons;src:url(%1$slib/eicons/fonts/eicons.eot?%2$s);src:url(%1$slib/eicons/fonts/eicons.eot?%2$s#iefix) format("embedded-opentype"),url(%1$slib/eicons/fonts/eicons.woff2?%2$s) format("woff2"),url(%1$slib/eicons/fonts/eicons.woff?%2$s) format("woff"),url(%1$slib/eicons/fonts/eicons.ttf?%2$s) format("truetype"),url(%1$slib/eicons/fonts/eicons.svg?%2$s#eicon) format("svg");font-weight:400;font-style:normal}', ELEMENTOR_ASSETS_URL, $elementor_icons_library_version ); | |
| 1598 | 1429 | |
| 1599 | - return force_balance_tags( $parts['main'] ) . $more_link; | |
| 1430 | + wp_add_inline_style( 'elementor-frontend', $elementor_icons_inline_css ); | |
| 1600 | 1431 | } |
| 1601 | 1432 | } |
