| @@ -1,18 +1,16 @@ | ||
| 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; | |
| 7 | 5 | use Elementor\Core\Frontend\Render_Mode_Manager; |
| 8 | 6 | use Elementor\Core\Responsive\Files\Frontend as FrontendFile; |
| 7 | +use Elementor\Core\Files\CSS\Global_CSS; | |
| 9 | 8 | use Elementor\Core\Files\CSS\Post as Post_CSS; |
| 10 | 9 | use Elementor\Core\Files\CSS\Post_Preview; |
| 11 | 10 | use Elementor\Core\Responsive\Responsive; |
| 12 | 11 | use Elementor\Core\Settings\Manager as SettingsManager; |
| 13 | 12 | use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager; |
| 14 | -use Elementor\Modules\FloatingButtons\Module; | |
| 15 | 13 | |
| 16 | 14 | if ( ! defined( 'ABSPATH' ) ) { |
| 17 | 15 | exit; // Exit if accessed directly. |
| 18 | 16 | } |
| @@ -32,13 +30,8 @@ | ||
| 32 | 30 | */ |
| 33 | 31 | const THE_CONTENT_FILTER_PRIORITY = 9; |
| 34 | 32 | |
| 35 | 33 | /** |
| 36 | - * The priority of the frontend enqueued styles. | |
| 37 | - */ | |
| 38 | - const ENQUEUED_STYLES_PRIORITY = 20; | |
| 39 | - | |
| 40 | - /** | |
| 41 | 34 | * Post ID. |
| 42 | 35 | * |
| 43 | 36 | * Holds the ID of the current post. |
| 44 | 37 | * |
| @@ -146,8 +139,10 @@ | ||
| 146 | 139 | private $body_classes = [ |
| 147 | 140 | 'elementor-default', |
| 148 | 141 | ]; |
| 149 | 142 | |
| 143 | + private $google_fonts_index = 0; | |
| 144 | + | |
| 150 | 145 | /** |
| 151 | 146 | * Front End constructor. |
| 152 | 147 | * |
| 153 | 148 | * Initializing Elementor front end. Make sure we are not in admin, not and |
| @@ -171,12 +166,8 @@ | ||
| 171 | 166 | |
| 172 | 167 | // Hack to avoid enqueue post CSS while it's a `the_excerpt` call. |
| 173 | 168 | add_filter( 'get_the_excerpt', [ $this, 'start_excerpt_flag' ], 1 ); |
| 174 | 169 | 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 | 170 | } |
| 180 | 171 | |
| 181 | 172 | /** |
| 182 | 173 | * Get module name. |
| @@ -233,27 +224,36 @@ | ||
| 233 | 224 | |
| 234 | 225 | $document = Plugin::$instance->documents->get( $this->post_id ); |
| 235 | 226 | |
| 236 | 227 | if ( is_singular() && $document && $document->is_built_with_elementor() ) { |
| 237 | - add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_styles' ], self::ENQUEUED_STYLES_PRIORITY ); | |
| 228 | + add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_styles' ] ); | |
| 238 | 229 | } |
| 239 | 230 | |
| 240 | 231 | // Priority 7 to allow google fonts in header template to load in <head> tag |
| 241 | 232 | add_action( 'wp_head', [ $this, 'print_fonts_links' ], 7 ); |
| 233 | + add_action( 'wp_head', [ $this, 'print_google_fonts_preconnect_tag' ], 8 ); | |
| 242 | 234 | add_action( 'wp_head', [ $this, 'add_theme_color_meta_tag' ] ); |
| 243 | 235 | add_action( 'wp_footer', [ $this, 'wp_footer' ] ); |
| 244 | 236 | } |
| 245 | 237 | |
| 238 | + public function print_google_fonts_preconnect_tag() { | |
| 239 | + if ( 0 >= $this->google_fonts_index ) { | |
| 240 | + return; | |
| 241 | + } | |
| 242 | + | |
| 243 | + echo '<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>'; | |
| 244 | + } | |
| 245 | + | |
| 246 | 246 | /** |
| 247 | 247 | * @since 2.0.12 |
| 248 | 248 | * @access public |
| 249 | - * @param string|array $class_name | |
| 249 | + * @param string|array $class | |
| 250 | 250 | */ |
| 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 ); | |
| 251 | + public function add_body_class( $class ) { | |
| 252 | + if ( is_array( $class ) ) { | |
| 253 | + $this->body_classes = array_merge( $this->body_classes, $class ); | |
| 254 | 254 | } else { |
| 255 | - $this->body_classes[] = $class_name; | |
| 255 | + $this->body_classes[] = $class; | |
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
| @@ -267,9 +267,9 @@ | ||
| 267 | 267 | $mobile_theme_color = $kit->get_settings( 'mobile_browser_background' ); |
| 268 | 268 | |
| 269 | 269 | if ( ! empty( $mobile_theme_color ) ) { |
| 270 | 270 | ?> |
| 271 | - <meta name="theme-color" content="<?php echo esc_attr( $mobile_theme_color ); ?>"> | |
| 271 | + <meta name="theme-color" content="<?php echo esc_html( $mobile_theme_color ); ?>"> | |
| 272 | 272 | <?php |
| 273 | 273 | } |
| 274 | 274 | } |
| 275 | 275 | |
| @@ -376,12 +376,14 @@ | ||
| 376 | 376 | true |
| 377 | 377 | ); |
| 378 | 378 | |
| 379 | 379 | wp_register_script( |
| 380 | - 'swiper', | |
| 381 | - $this->get_js_assets_url( 'swiper', 'assets/lib/swiper/v8/' ), | |
| 382 | - [], | |
| 383 | - '8.4.5', | |
| 380 | + 'elementor-waypoints', | |
| 381 | + $this->get_js_assets_url( 'waypoints', 'assets/lib/waypoints/' ), | |
| 382 | + [ | |
| 383 | + 'jquery', | |
| 384 | + ], | |
| 385 | + '4.0.2', | |
| 384 | 386 | true |
| 385 | 387 | ); |
| 386 | 388 | |
| 387 | 389 | wp_register_script( |
| @@ -389,9 +391,9 @@ | ||
| 389 | 391 | $this->get_js_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 390 | 392 | [ |
| 391 | 393 | 'jquery', |
| 392 | 394 | ], |
| 393 | - '4.6.13', | |
| 395 | + '4.1.4', | |
| 394 | 396 | true |
| 395 | 397 | ); |
| 396 | 398 | |
| 397 | 399 | wp_register_script( |
| @@ -419,9 +421,9 @@ | ||
| 419 | 421 | $this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ), |
| 420 | 422 | [ |
| 421 | 423 | 'jquery-ui-position', |
| 422 | 424 | ], |
| 423 | - '4.9.4', | |
| 425 | + '4.9.0', | |
| 424 | 426 | true |
| 425 | 427 | ); |
| 426 | 428 | |
| 427 | 429 | wp_register_script( |
| @@ -446,18 +448,13 @@ | ||
| 446 | 448 | |
| 447 | 449 | wp_register_script( |
| 448 | 450 | 'elementor-frontend', |
| 449 | 451 | $this->get_js_assets_url( 'frontend' ), |
| 450 | - [ | |
| 451 | - 'elementor-frontend-modules', | |
| 452 | - 'jquery-ui-position', | |
| 453 | - ], | |
| 452 | + $this->get_elementor_frontend_dependencies(), | |
| 454 | 453 | ELEMENTOR_VERSION, |
| 455 | 454 | true |
| 456 | 455 | ); |
| 457 | 456 | |
| 458 | - $this->register_frontend_handlers(); | |
| 459 | - | |
| 460 | 457 | /** |
| 461 | 458 | * After frontend register scripts. |
| 462 | 459 | * |
| 463 | 460 | * Fires after Elementor frontend scripts are registered. |
| @@ -477,12 +474,8 @@ | ||
| 477 | 474 | * @since 1.2.0 |
| 478 | 475 | * @access public |
| 479 | 476 | */ |
| 480 | 477 | 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 | 478 | /** |
| 486 | 479 | * Before frontend register styles. |
| 487 | 480 | * |
| 488 | 481 | * Fires before Elementor frontend styles are registered. |
| @@ -508,9 +501,9 @@ | ||
| 508 | 501 | wp_register_style( |
| 509 | 502 | 'flatpickr', |
| 510 | 503 | $this->get_css_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 511 | 504 | [], |
| 512 | - '4.6.13' | |
| 505 | + '4.1.4' | |
| 513 | 506 | ); |
| 514 | 507 | |
| 515 | 508 | wp_register_style( |
| 516 | 509 | 'elementor-gallery', |
| @@ -518,69 +511,38 @@ | ||
| 518 | 511 | [], |
| 519 | 512 | '1.2.0' |
| 520 | 513 | ); |
| 521 | 514 | |
| 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 | - ); | |
| 515 | + $min_suffix = Utils::is_script_debug() ? '' : '.min'; | |
| 528 | 516 | |
| 529 | - wp_register_style( | |
| 530 | - 'e-swiper', | |
| 531 | - $this->get_css_assets_url( 'e-swiper', 'assets/css/conditionals/' ), | |
| 532 | - [ 'swiper' ], | |
| 533 | - ELEMENTOR_VERSION | |
| 534 | - ); | |
| 517 | + $direction_suffix = is_rtl() ? '-rtl' : ''; | |
| 535 | 518 | |
| 536 | - wp_register_style( | |
| 537 | - 'swiper', | |
| 538 | - $this->get_css_assets_url( 'swiper', 'assets/lib/swiper/v8/css/' ), | |
| 539 | - [], | |
| 540 | - '8.4.5' | |
| 541 | - ); | |
| 519 | + $frontend_base_file_name = $this->is_optimized_css_mode() ? 'frontend-lite' : 'frontend'; | |
| 542 | 520 | |
| 543 | - wp_register_style( | |
| 544 | - 'elementor-wp-admin-bar', | |
| 545 | - $this->get_css_assets_url( 'admin-bar', 'assets/css/' ), | |
| 546 | - [], | |
| 547 | - ELEMENTOR_VERSION | |
| 548 | - ); | |
| 521 | + $frontend_file_name = $frontend_base_file_name . $direction_suffix . $min_suffix . '.css'; | |
| 549 | 522 | |
| 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 | - ); | |
| 523 | + $frontend_dependencies = []; | |
| 556 | 524 | |
| 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 | - ); | |
| 525 | + $has_custom_breakpoints = Plugin::$instance->breakpoints->has_custom_breakpoints(); | |
| 563 | 526 | |
| 564 | - $widgets_with_styles = Plugin::$instance->widgets_manager->widgets_with_styles(); | |
| 565 | - foreach ( $widgets_with_styles as $widget_name ) { | |
| 527 | + if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { | |
| 528 | + // If The Dom Optimization feature is disabled, register the legacy CSS | |
| 566 | 529 | wp_register_style( |
| 567 | - "widget-{$widget_name}", | |
| 568 | - $this->get_css_assets_url( "widget-{$widget_name}", null, true, true ), | |
| 569 | - [ 'elementor-frontend' ], | |
| 530 | + 'elementor-frontend-legacy', | |
| 531 | + $this->get_frontend_file_url( 'frontend-legacy' . $direction_suffix . $min_suffix . '.css', $has_custom_breakpoints ), | |
| 532 | + [], | |
| 570 | 533 | ELEMENTOR_VERSION |
| 571 | 534 | ); |
| 535 | + | |
| 536 | + $frontend_dependencies[] = 'elementor-frontend-legacy'; | |
| 572 | 537 | } |
| 573 | 538 | |
| 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 | - } | |
| 539 | + wp_register_style( | |
| 540 | + 'elementor-frontend', | |
| 541 | + $this->get_frontend_file_url( $frontend_file_name, $has_custom_breakpoints ), | |
| 542 | + $frontend_dependencies, | |
| 543 | + $has_custom_breakpoints ? null : ELEMENTOR_VERSION | |
| 544 | + ); | |
| 583 | 545 | |
| 584 | 546 | /** |
| 585 | 547 | * After frontend register styles. |
| 586 | 548 | * |
| @@ -591,23 +553,8 @@ | ||
| 591 | 553 | do_action( 'elementor/frontend/after_register_styles' ); |
| 592 | 554 | } |
| 593 | 555 | |
| 594 | 556 | /** |
| 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 | 557 | * Enqueue scripts. |
| 611 | 558 | * |
| 612 | 559 | * Enqueue all the frontend scripts. |
| 613 | 560 | * |
| @@ -623,8 +570,22 @@ | ||
| 623 | 570 | * @since 1.0.0 |
| 624 | 571 | */ |
| 625 | 572 | do_action( 'elementor/frontend/before_enqueue_scripts' ); |
| 626 | 573 | |
| 574 | + wp_enqueue_script( 'elementor-frontend' ); | |
| 575 | + | |
| 576 | + if ( ! $this->is_improved_assets_loading() ) { | |
| 577 | + wp_enqueue_script( | |
| 578 | + 'preloaded-modules', | |
| 579 | + $this->get_js_assets_url( 'preloaded-modules', 'assets/js/' ), | |
| 580 | + [ | |
| 581 | + 'elementor-frontend', | |
| 582 | + ], | |
| 583 | + ELEMENTOR_VERSION, | |
| 584 | + true | |
| 585 | + ); | |
| 586 | + } | |
| 587 | + | |
| 627 | 588 | $this->print_config(); |
| 628 | 589 | |
| 629 | 590 | $this->enqueue_conditional_assets(); |
| 630 | 591 | |
| @@ -669,12 +630,8 @@ | ||
| 669 | 630 | } |
| 670 | 631 | |
| 671 | 632 | wp_enqueue_style( 'elementor-frontend' ); |
| 672 | 633 | |
| 673 | - if ( is_admin_bar_showing() ) { | |
| 674 | - wp_enqueue_style( 'elementor-wp-admin-bar' ); | |
| 675 | - } | |
| 676 | - | |
| 677 | 634 | /** |
| 678 | 635 | * After frontend styles enqueued. |
| 679 | 636 | * |
| 680 | 637 | * Fires after Elementor frontend styles are enqueued. |
| @@ -683,44 +640,20 @@ | ||
| 683 | 640 | */ |
| 684 | 641 | do_action( 'elementor/frontend/after_enqueue_styles' ); |
| 685 | 642 | |
| 686 | 643 | if ( ! Plugin::$instance->preview->is_preview_mode() ) { |
| 644 | + $this->parse_global_css_code(); | |
| 645 | + | |
| 687 | 646 | $post_id = get_the_ID(); |
| 688 | 647 | // Check $post_id for virtual pages. check is singular because the $post_id is set to the first post on archive pages. |
| 689 | 648 | if ( $post_id && is_singular() ) { |
| 690 | - do_action( 'elementor/post/render', $post_id ); | |
| 691 | - $this->handle_page_assets( $post_id ); | |
| 692 | - | |
| 693 | 649 | $css_file = Post_CSS::create( get_the_ID() ); |
| 694 | 650 | $css_file->enqueue(); |
| 695 | 651 | } |
| 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 | 652 | } |
| 702 | - | |
| 703 | - do_action( 'elementor/frontend/after_enqueue_post_styles' ); | |
| 704 | 653 | } |
| 705 | 654 | } |
| 706 | 655 | |
| 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 | 656 | /** |
| 724 | 657 | * Get Frontend File URL |
| 725 | 658 | * |
| 726 | 659 | * Returns the URL for the CSS file to be loaded in the front end. If requested via the second parameter, a custom |
| @@ -729,20 +662,20 @@ | ||
| 729 | 662 | * @since 3.4.5 |
| 730 | 663 | * |
| 731 | 664 | * @access public |
| 732 | 665 | * |
| 733 | - * @param string $frontend_file_name | |
| 666 | + * @param string $frontend_file_name | |
| 734 | 667 | * @param boolean $custom_file |
| 735 | 668 | * |
| 736 | 669 | * @return string frontend file URL |
| 737 | 670 | */ |
| 738 | - public function get_frontend_file_url( $frontend_file_name, $custom_file, $css_subfolder = '' ) { | |
| 671 | + public function get_frontend_file_url( $frontend_file_name, $custom_file ) { | |
| 739 | 672 | if ( $custom_file ) { |
| 740 | 673 | $frontend_file = $this->get_frontend_file( $frontend_file_name ); |
| 741 | 674 | |
| 742 | 675 | $frontend_file_url = $frontend_file->get_url(); |
| 743 | 676 | } else { |
| 744 | - $frontend_file_url = ELEMENTOR_ASSETS_URL . 'css/' . $css_subfolder . $frontend_file_name; | |
| 677 | + $frontend_file_url = ELEMENTOR_ASSETS_URL . 'css/' . $frontend_file_name; | |
| 745 | 678 | } |
| 746 | 679 | |
| 747 | 680 | return $frontend_file_url; |
| 748 | 681 | } |
| @@ -755,9 +688,9 @@ | ||
| 755 | 688 | * |
| 756 | 689 | * @since 3.5.0 |
| 757 | 690 | * @access public |
| 758 | 691 | * |
| 759 | - * @param string $frontend_file_name | |
| 692 | + * @param string $frontend_file_name | |
| 760 | 693 | * @param boolean $custom_file |
| 761 | 694 | * |
| 762 | 695 | * @return string frontend file path |
| 763 | 696 | */ |
| @@ -900,20 +833,8 @@ | ||
| 900 | 833 | * @since 1.9.4 |
| 901 | 834 | * @access public |
| 902 | 835 | */ |
| 903 | 836 | 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 | 837 | $google_fonts = $this->get_list_of_google_fonts_by_type(); |
| 917 | 838 | |
| 918 | 839 | $this->enqueue_google_fonts( $google_fonts ); |
| 919 | 840 | $this->enqueue_icon_fonts(); |
| @@ -944,9 +865,9 @@ | ||
| 944 | 865 | wp_enqueue_style( 'elementor-icons-' . $icon_type ); |
| 945 | 866 | $this->enqueued_icon_fonts[] = $css_url; |
| 946 | 867 | } |
| 947 | 868 | |
| 948 | - // Clear enqueued icons. | |
| 869 | + //clear enqueued icons | |
| 949 | 870 | $this->icon_fonts_to_enqueue = []; |
| 950 | 871 | } |
| 951 | 872 | |
| 952 | 873 | /** |
| @@ -1027,9 +948,9 @@ | ||
| 1027 | 948 | * @param array $google_fonts Optional. Google fonts to print in the frontend. |
| 1028 | 949 | * Default is an empty array. |
| 1029 | 950 | */ |
| 1030 | 951 | private function enqueue_google_fonts( $google_fonts = [] ) { |
| 1031 | - $print_google_fonts = Fonts::is_google_fonts_enabled(); | |
| 952 | + $print_google_fonts = true; | |
| 1032 | 953 | |
| 1033 | 954 | /** |
| 1034 | 955 | * Print frontend google fonts. |
| 1035 | 956 | * |
| @@ -1044,21 +965,29 @@ | ||
| 1044 | 965 | if ( ! $print_google_fonts ) { |
| 1045 | 966 | return; |
| 1046 | 967 | } |
| 1047 | 968 | |
| 1048 | - $force_enqueue_from_cdn = Plugin::$instance->preview->is_preview_mode(); | |
| 969 | + // Print used fonts | |
| 970 | + if ( ! empty( $google_fonts['google'] ) ) { | |
| 971 | + $this->google_fonts_index++; | |
| 1049 | 972 | |
| 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 ); | |
| 1053 | - } | |
| 973 | + $fonts_url = $this->get_stable_google_fonts_url( $google_fonts['google'] ); | |
| 974 | + | |
| 975 | + wp_enqueue_style( 'google-fonts-' . $this->google_fonts_index, $fonts_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1054 | 976 | } |
| 1055 | 977 | |
| 1056 | 978 | if ( ! empty( $google_fonts['early'] ) ) { |
| 1057 | - foreach ( $google_fonts['early'] as $current_font ) { | |
| 1058 | - Google_Font::enqueue( $current_font, Google_Font::TYPE_EARLYACCESS, $force_enqueue_from_cdn ); | |
| 979 | + $early_access_font_urls = $this->get_early_access_google_font_urls( $google_fonts['early'] ); | |
| 980 | + | |
| 981 | + foreach ( $early_access_font_urls as $ea_font_url ) { | |
| 982 | + $this->google_fonts_index++; | |
| 983 | + | |
| 984 | + //printf( '<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/earlyaccess/%s.css">', strtolower( str_replace( ' ', '', $current_font ) ) ); | |
| 985 | + | |
| 986 | + wp_enqueue_style( 'google-earlyaccess-' . $this->google_fonts_index, $ea_font_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1059 | 987 | } |
| 1060 | 988 | } |
| 989 | + | |
| 1061 | 990 | } |
| 1062 | 991 | |
| 1063 | 992 | /** |
| 1064 | 993 | * Enqueue fonts. |
| @@ -1079,8 +1008,22 @@ | ||
| 1079 | 1008 | $this->registered_fonts[] = $font; |
| 1080 | 1009 | } |
| 1081 | 1010 | |
| 1082 | 1011 | /** |
| 1012 | + * Parse global CSS. | |
| 1013 | + * | |
| 1014 | + * Enqueue the global CSS file. | |
| 1015 | + * | |
| 1016 | + * @since 1.2.0 | |
| 1017 | + * @access protected | |
| 1018 | + */ | |
| 1019 | + protected function parse_global_css_code() { | |
| 1020 | + $scheme_css_file = Global_CSS::create( 'global.css' ); | |
| 1021 | + | |
| 1022 | + $scheme_css_file->enqueue(); | |
| 1023 | + } | |
| 1024 | + | |
| 1025 | + /** | |
| 1083 | 1026 | * Apply builder in content. |
| 1084 | 1027 | * |
| 1085 | 1028 | * Used to apply the Elementor page editor on the post content. |
| 1086 | 1029 | * |
| @@ -1147,21 +1090,8 @@ | ||
| 1147 | 1090 | |
| 1148 | 1091 | $data = $document->get_elements_data(); |
| 1149 | 1092 | |
| 1150 | 1093 | /** |
| 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 | 1094 | * Frontend builder content data. |
| 1165 | 1095 | * |
| 1166 | 1096 | * Filters the builder content in the frontend. |
| 1167 | 1097 | * |
| @@ -1257,9 +1187,9 @@ | ||
| 1257 | 1187 | * |
| 1258 | 1188 | * @since 1.0.0 |
| 1259 | 1189 | * @access public |
| 1260 | 1190 | * |
| 1261 | - * @param int $post_id The post ID. | |
| 1191 | + * @param int $post_id The post ID. | |
| 1262 | 1192 | * |
| 1263 | 1193 | * @param bool $with_css Optional. Whether to retrieve the content with CSS |
| 1264 | 1194 | * or not. Default is false. |
| 1265 | 1195 | * |
| @@ -1425,9 +1355,9 @@ | ||
| 1425 | 1355 | 'isScriptDebug' => Utils::is_script_debug(), |
| 1426 | 1356 | ], |
| 1427 | 1357 | 'i18n' => [ |
| 1428 | 1358 | 'shareOnFacebook' => esc_html__( 'Share on Facebook', 'elementor' ), |
| 1429 | - 'shareOnX' => esc_html__( 'Share on X', 'elementor' ), | |
| 1359 | + 'shareOnTwitter' => esc_html__( 'Share on Twitter', 'elementor' ), | |
| 1430 | 1360 | 'pinIt' => esc_html__( 'Pin it', 'elementor' ), |
| 1431 | 1361 | 'download' => esc_html__( 'Download', 'elementor' ), |
| 1432 | 1362 | 'downloadImage' => esc_html__( 'Download image', 'elementor' ), |
| 1433 | 1363 | 'fullscreen' => esc_html__( 'Fullscreen', 'elementor' ), |
| @@ -1436,13 +1366,8 @@ | ||
| 1436 | 1366 | 'playVideo' => esc_html__( 'Play Video', 'elementor' ), |
| 1437 | 1367 | 'previous' => esc_html__( 'Previous', 'elementor' ), |
| 1438 | 1368 | 'next' => esc_html__( 'Next', 'elementor' ), |
| 1439 | 1369 | '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' ), | |
| 1445 | 1370 | ], |
| 1446 | 1371 | 'is_rtl' => is_rtl(), |
| 1447 | 1372 | // 'breakpoints' object is kept for BC. |
| 1448 | 1373 | 'breakpoints' => Responsive::get_breakpoints(), |
| @@ -1448,9 +1373,8 @@ | ||
| 1448 | 1373 | 'breakpoints' => Responsive::get_breakpoints(), |
| 1449 | 1374 | // 'responsive' contains the custom breakpoints config introduced in Elementor v3.2.0 |
| 1450 | 1375 | 'responsive' => [ |
| 1451 | 1376 | 'breakpoints' => Plugin::$instance->breakpoints->get_breakpoints_config(), |
| 1452 | - 'hasCustomBreakpoints' => Plugin::$instance->breakpoints->has_custom_breakpoints(), | |
| 1453 | 1377 | ], |
| 1454 | 1378 | 'version' => ELEMENTOR_VERSION, |
| 1455 | 1379 | 'is_static' => $this->is_static_render_mode(), |
| 1456 | 1380 | 'experimentalFeatures' => $active_experimental_features, |
| @@ -1455,16 +1379,9 @@ | ||
| 1455 | 1379 | 'is_static' => $this->is_static_render_mode(), |
| 1456 | 1380 | 'experimentalFeatures' => $active_experimental_features, |
| 1457 | 1381 | 'urls' => [ |
| 1458 | 1382 | 'assets' => $assets_url, |
| 1459 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), | |
| 1460 | - 'uploadUrl' => wp_upload_dir()['baseurl'], | |
| 1461 | 1383 | ], |
| 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 | 1384 | ]; |
| 1468 | 1385 | |
| 1469 | 1386 | $settings['settings'] = SettingsManager::get_settings_frontend_config(); |
| 1470 | 1387 | |
| @@ -1546,9 +1463,9 @@ | ||
| 1546 | 1463 | * |
| 1547 | 1464 | * @access private |
| 1548 | 1465 | * @since 2.0.4 |
| 1549 | 1466 | * |
| 1550 | - * @param string $content | |
| 1467 | + * @param $content | |
| 1551 | 1468 | * |
| 1552 | 1469 | * @return string |
| 1553 | 1470 | */ |
| 1554 | 1471 | private function process_more_tag( $content ) { |
| @@ -1596,6 +1513,40 @@ | ||
| 1596 | 1513 | */ |
| 1597 | 1514 | $more_link = apply_filters( 'the_content_more_link', $more_link, $more_link_text ); |
| 1598 | 1515 | |
| 1599 | 1516 | return force_balance_tags( $parts['main'] ) . $more_link; |
| 1517 | + } | |
| 1518 | + | |
| 1519 | + private function is_improved_assets_loading() { | |
| 1520 | + return Plugin::$instance->experiments->is_feature_active( 'e_optimized_assets_loading' ); | |
| 1521 | + } | |
| 1522 | + | |
| 1523 | + private function get_elementor_frontend_dependencies() { | |
| 1524 | + $dependencies = [ | |
| 1525 | + 'elementor-frontend-modules', | |
| 1526 | + 'elementor-waypoints', | |
| 1527 | + 'jquery-ui-position', | |
| 1528 | + ]; | |
| 1529 | + | |
| 1530 | + if ( ! $this->is_improved_assets_loading() ) { | |
| 1531 | + wp_register_script( | |
| 1532 | + 'swiper', | |
| 1533 | + $this->get_js_assets_url( 'swiper', 'assets/lib/swiper/' ), | |
| 1534 | + [], | |
| 1535 | + '5.3.6', | |
| 1536 | + true | |
| 1537 | + ); | |
| 1538 | + | |
| 1539 | + $dependencies[] = 'swiper'; | |
| 1540 | + $dependencies[] = 'share-link'; | |
| 1541 | + $dependencies[] = 'elementor-dialog'; | |
| 1542 | + } | |
| 1543 | + | |
| 1544 | + return $dependencies; | |
| 1545 | + } | |
| 1546 | + | |
| 1547 | + private function is_optimized_css_mode() { | |
| 1548 | + $is_optimized_css_loading = Plugin::$instance->experiments->is_feature_active( 'e_optimized_css_loading' ); | |
| 1549 | + | |
| 1550 | + return ! Utils::is_script_debug() && $is_optimized_css_loading && ! Plugin::$instance->preview->is_preview_mode(); | |
| 1600 | 1551 | } |
| 1601 | 1552 | } |
