| @@ -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,9 +139,21 @@ | ||
| 146 | 139 | private $body_classes = [ |
| 147 | 140 | 'elementor-default', |
| 148 | 141 | ]; |
| 149 | 142 | |
| 143 | + private $google_fonts_index = 0; | |
| 144 | + | |
| 150 | 145 | /** |
| 146 | + * @var string | |
| 147 | + */ | |
| 148 | + private $e_swiper_asset_path; | |
| 149 | + | |
| 150 | + /** | |
| 151 | + * @var string | |
| 152 | + */ | |
| 153 | + private $e_swiper_version; | |
| 154 | + | |
| 155 | + /** | |
| 151 | 156 | * Front End constructor. |
| 152 | 157 | * |
| 153 | 158 | * Initializing Elementor front end. Make sure we are not in admin, not and |
| 154 | 159 | * redirect from old URL structure of Elementor editor. |
| @@ -167,16 +172,13 @@ | ||
| 167 | 172 | add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ], 5 ); |
| 168 | 173 | add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 5 ); |
| 169 | 174 | |
| 170 | 175 | $this->add_content_filter(); |
| 176 | + $this->init_swiper_settings(); | |
| 171 | 177 | |
| 172 | 178 | // Hack to avoid enqueue post CSS while it's a `the_excerpt` call. |
| 173 | 179 | add_filter( 'get_the_excerpt', [ $this, 'start_excerpt_flag' ], 1 ); |
| 174 | 180 | 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 | 181 | } |
| 180 | 182 | |
| 181 | 183 | /** |
| 182 | 184 | * Get module name. |
| @@ -233,27 +235,36 @@ | ||
| 233 | 235 | |
| 234 | 236 | $document = Plugin::$instance->documents->get( $this->post_id ); |
| 235 | 237 | |
| 236 | 238 | if ( is_singular() && $document && $document->is_built_with_elementor() ) { |
| 237 | - add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_styles' ], self::ENQUEUED_STYLES_PRIORITY ); | |
| 239 | + add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_styles' ] ); | |
| 238 | 240 | } |
| 239 | 241 | |
| 240 | 242 | // Priority 7 to allow google fonts in header template to load in <head> tag |
| 241 | 243 | add_action( 'wp_head', [ $this, 'print_fonts_links' ], 7 ); |
| 244 | + add_action( 'wp_head', [ $this, 'print_google_fonts_preconnect_tag' ], 8 ); | |
| 242 | 245 | add_action( 'wp_head', [ $this, 'add_theme_color_meta_tag' ] ); |
| 243 | 246 | add_action( 'wp_footer', [ $this, 'wp_footer' ] ); |
| 244 | 247 | } |
| 245 | 248 | |
| 249 | + public function print_google_fonts_preconnect_tag() { | |
| 250 | + if ( 0 >= $this->google_fonts_index ) { | |
| 251 | + return; | |
| 252 | + } | |
| 253 | + | |
| 254 | + echo '<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>'; | |
| 255 | + } | |
| 256 | + | |
| 246 | 257 | /** |
| 247 | 258 | * @since 2.0.12 |
| 248 | 259 | * @access public |
| 249 | - * @param string|array $class_name | |
| 260 | + * @param string|array $class | |
| 250 | 261 | */ |
| 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 ); | |
| 262 | + public function add_body_class( $class ) { | |
| 263 | + if ( is_array( $class ) ) { | |
| 264 | + $this->body_classes = array_merge( $this->body_classes, $class ); | |
| 254 | 265 | } else { |
| 255 | - $this->body_classes[] = $class_name; | |
| 266 | + $this->body_classes[] = $class; | |
| 256 | 267 | } |
| 257 | 268 | } |
| 258 | 269 | |
| 259 | 270 | /** |
| @@ -323,8 +334,14 @@ | ||
| 323 | 334 | public function add_content_filter() { |
| 324 | 335 | add_filter( 'the_content', [ $this, 'apply_builder_in_content' ], self::THE_CONTENT_FILTER_PRIORITY ); |
| 325 | 336 | } |
| 326 | 337 | |
| 338 | + public function init_swiper_settings() { | |
| 339 | + $e_swiper_latest = Plugin::$instance->experiments->is_feature_active( 'e_swiper_latest' ); | |
| 340 | + $this->e_swiper_asset_path = $e_swiper_latest ? 'assets/lib/swiper/v8/' : 'assets/lib/swiper/'; | |
| 341 | + $this->e_swiper_version = $e_swiper_latest ? '8.4.5' : '5.3.6'; | |
| 342 | + } | |
| 343 | + | |
| 327 | 344 | /** |
| 328 | 345 | * Remove content filter. |
| 329 | 346 | * |
| 330 | 347 | * When the Elementor generated content rendered, we remove the filter to prevent multiple |
| @@ -376,12 +393,14 @@ | ||
| 376 | 393 | true |
| 377 | 394 | ); |
| 378 | 395 | |
| 379 | 396 | wp_register_script( |
| 380 | - 'swiper', | |
| 381 | - $this->get_js_assets_url( 'swiper', 'assets/lib/swiper/v8/' ), | |
| 382 | - [], | |
| 383 | - '8.4.5', | |
| 397 | + 'elementor-waypoints', | |
| 398 | + $this->get_js_assets_url( 'waypoints', 'assets/lib/waypoints/' ), | |
| 399 | + [ | |
| 400 | + 'jquery', | |
| 401 | + ], | |
| 402 | + '4.0.2', | |
| 384 | 403 | true |
| 385 | 404 | ); |
| 386 | 405 | |
| 387 | 406 | wp_register_script( |
| @@ -389,9 +408,9 @@ | ||
| 389 | 408 | $this->get_js_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 390 | 409 | [ |
| 391 | 410 | 'jquery', |
| 392 | 411 | ], |
| 393 | - '4.6.13', | |
| 412 | + '4.1.4', | |
| 394 | 413 | true |
| 395 | 414 | ); |
| 396 | 415 | |
| 397 | 416 | wp_register_script( |
| @@ -419,9 +438,9 @@ | ||
| 419 | 438 | $this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ), |
| 420 | 439 | [ |
| 421 | 440 | 'jquery-ui-position', |
| 422 | 441 | ], |
| 423 | - '4.9.4', | |
| 442 | + '4.9.0', | |
| 424 | 443 | true |
| 425 | 444 | ); |
| 426 | 445 | |
| 427 | 446 | wp_register_script( |
| @@ -446,18 +465,13 @@ | ||
| 446 | 465 | |
| 447 | 466 | wp_register_script( |
| 448 | 467 | 'elementor-frontend', |
| 449 | 468 | $this->get_js_assets_url( 'frontend' ), |
| 450 | - [ | |
| 451 | - 'elementor-frontend-modules', | |
| 452 | - 'jquery-ui-position', | |
| 453 | - ], | |
| 469 | + $this->get_elementor_frontend_dependencies(), | |
| 454 | 470 | ELEMENTOR_VERSION, |
| 455 | 471 | true |
| 456 | 472 | ); |
| 457 | 473 | |
| 458 | - $this->register_frontend_handlers(); | |
| 459 | - | |
| 460 | 474 | /** |
| 461 | 475 | * After frontend register scripts. |
| 462 | 476 | * |
| 463 | 477 | * Fires after Elementor frontend scripts are registered. |
| @@ -477,12 +491,8 @@ | ||
| 477 | 491 | * @since 1.2.0 |
| 478 | 492 | * @access public |
| 479 | 493 | */ |
| 480 | 494 | 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 | 495 | /** |
| 486 | 496 | * Before frontend register styles. |
| 487 | 497 | * |
| 488 | 498 | * Fires before Elementor frontend styles are registered. |
| @@ -508,9 +518,9 @@ | ||
| 508 | 518 | wp_register_style( |
| 509 | 519 | 'flatpickr', |
| 510 | 520 | $this->get_css_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 511 | 521 | [], |
| 512 | - '4.6.13' | |
| 522 | + '4.1.4' | |
| 513 | 523 | ); |
| 514 | 524 | |
| 515 | 525 | wp_register_style( |
| 516 | 526 | 'elementor-gallery', |
| @@ -518,70 +528,32 @@ | ||
| 518 | 528 | [], |
| 519 | 529 | '1.2.0' |
| 520 | 530 | ); |
| 521 | 531 | |
| 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 | - ); | |
| 532 | + $min_suffix = Utils::is_script_debug() ? '' : '.min'; | |
| 528 | 533 | |
| 529 | - wp_register_style( | |
| 530 | - 'e-swiper', | |
| 531 | - $this->get_css_assets_url( 'e-swiper', 'assets/css/conditionals/' ), | |
| 532 | - [ 'swiper' ], | |
| 533 | - ELEMENTOR_VERSION | |
| 534 | - ); | |
| 534 | + $direction_suffix = is_rtl() ? '-rtl' : ''; | |
| 535 | 535 | |
| 536 | - wp_register_style( | |
| 537 | - 'swiper', | |
| 538 | - $this->get_css_assets_url( 'swiper', 'assets/lib/swiper/v8/css/' ), | |
| 539 | - [], | |
| 540 | - '8.4.5' | |
| 541 | - ); | |
| 536 | + $frontend_base_file_name = $this->is_optimized_css_mode() ? 'frontend-lite' : 'frontend'; | |
| 542 | 537 | |
| 543 | - wp_register_style( | |
| 544 | - 'elementor-wp-admin-bar', | |
| 545 | - $this->get_css_assets_url( 'admin-bar', 'assets/css/' ), | |
| 546 | - [], | |
| 547 | - ELEMENTOR_VERSION | |
| 548 | - ); | |
| 538 | + $frontend_file_name = $frontend_base_file_name . $direction_suffix . $min_suffix . '.css'; | |
| 549 | 539 | |
| 540 | + $has_custom_breakpoints = Plugin::$instance->breakpoints->has_custom_breakpoints(); | |
| 541 | + | |
| 550 | 542 | wp_register_style( |
| 551 | - 'e-lightbox', | |
| 552 | - $this->get_frontend_file_url( 'lightbox.min.css', $has_custom_breakpoints, 'conditionals/' ), | |
| 543 | + 'elementor-frontend', | |
| 544 | + $this->get_frontend_file_url( $frontend_file_name, $has_custom_breakpoints ), | |
| 553 | 545 | [], |
| 554 | 546 | $has_custom_breakpoints ? null : ELEMENTOR_VERSION |
| 555 | 547 | ); |
| 556 | 548 | |
| 557 | 549 | wp_register_style( |
| 558 | - 'elementor-frontend', | |
| 559 | - $this->get_frontend_file_url( "frontend{$min_suffix}.css", $has_custom_breakpoints ), | |
| 550 | + 'swiper', | |
| 551 | + $this->get_css_assets_url( 'swiper', $this->e_swiper_asset_path . 'css/' ), | |
| 560 | 552 | [], |
| 561 | - $has_custom_breakpoints ? null : ELEMENTOR_VERSION | |
| 553 | + $this->e_swiper_version | |
| 562 | 554 | ); |
| 563 | 555 | |
| 564 | - $widgets_with_styles = Plugin::$instance->widgets_manager->widgets_with_styles(); | |
| 565 | - foreach ( $widgets_with_styles as $widget_name ) { | |
| 566 | - wp_register_style( | |
| 567 | - "widget-{$widget_name}", | |
| 568 | - $this->get_css_assets_url( "widget-{$widget_name}", null, true, true ), | |
| 569 | - [ 'elementor-frontend' ], | |
| 570 | - ELEMENTOR_VERSION | |
| 571 | - ); | |
| 572 | - } | |
| 573 | - | |
| 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 | - } | |
| 583 | - | |
| 584 | 556 | /** |
| 585 | 557 | * After frontend register styles. |
| 586 | 558 | * |
| 587 | 559 | * Fires after Elementor frontend styles are registered. |
| @@ -591,23 +563,8 @@ | ||
| 591 | 563 | do_action( 'elementor/frontend/after_register_styles' ); |
| 592 | 564 | } |
| 593 | 565 | |
| 594 | 566 | /** |
| 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 | 567 | * Enqueue scripts. |
| 611 | 568 | * |
| 612 | 569 | * Enqueue all the frontend scripts. |
| 613 | 570 | * |
| @@ -623,8 +580,22 @@ | ||
| 623 | 580 | * @since 1.0.0 |
| 624 | 581 | */ |
| 625 | 582 | do_action( 'elementor/frontend/before_enqueue_scripts' ); |
| 626 | 583 | |
| 584 | + wp_enqueue_script( 'elementor-frontend' ); | |
| 585 | + | |
| 586 | + if ( ! $this->is_improved_assets_loading() ) { | |
| 587 | + wp_enqueue_script( | |
| 588 | + 'preloaded-modules', | |
| 589 | + $this->get_js_assets_url( 'preloaded-modules', 'assets/js/' ), | |
| 590 | + [ | |
| 591 | + 'elementor-frontend', | |
| 592 | + ], | |
| 593 | + ELEMENTOR_VERSION, | |
| 594 | + true | |
| 595 | + ); | |
| 596 | + } | |
| 597 | + | |
| 627 | 598 | $this->print_config(); |
| 628 | 599 | |
| 629 | 600 | $this->enqueue_conditional_assets(); |
| 630 | 601 | |
| @@ -669,11 +640,9 @@ | ||
| 669 | 640 | } |
| 670 | 641 | |
| 671 | 642 | wp_enqueue_style( 'elementor-frontend' ); |
| 672 | 643 | |
| 673 | - if ( is_admin_bar_showing() ) { | |
| 674 | - wp_enqueue_style( 'elementor-wp-admin-bar' ); | |
| 675 | - } | |
| 644 | + wp_enqueue_style( 'swiper' ); | |
| 676 | 645 | |
| 677 | 646 | /** |
| 678 | 647 | * After frontend styles enqueued. |
| 679 | 648 | * |
| @@ -683,44 +652,20 @@ | ||
| 683 | 652 | */ |
| 684 | 653 | do_action( 'elementor/frontend/after_enqueue_styles' ); |
| 685 | 654 | |
| 686 | 655 | if ( ! Plugin::$instance->preview->is_preview_mode() ) { |
| 656 | + $this->parse_global_css_code(); | |
| 657 | + | |
| 687 | 658 | $post_id = get_the_ID(); |
| 688 | 659 | // Check $post_id for virtual pages. check is singular because the $post_id is set to the first post on archive pages. |
| 689 | 660 | if ( $post_id && is_singular() ) { |
| 690 | - do_action( 'elementor/post/render', $post_id ); | |
| 691 | - $this->handle_page_assets( $post_id ); | |
| 692 | - | |
| 693 | 661 | $css_file = Post_CSS::create( get_the_ID() ); |
| 694 | 662 | $css_file->enqueue(); |
| 695 | 663 | } |
| 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 | 664 | } |
| 702 | - | |
| 703 | - do_action( 'elementor/frontend/after_enqueue_post_styles' ); | |
| 704 | 665 | } |
| 705 | 666 | } |
| 706 | 667 | |
| 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 | 668 | /** |
| 724 | 669 | * Get Frontend File URL |
| 725 | 670 | * |
| 726 | 671 | * Returns the URL for the CSS file to be loaded in the front end. If requested via the second parameter, a custom |
| @@ -729,20 +674,20 @@ | ||
| 729 | 674 | * @since 3.4.5 |
| 730 | 675 | * |
| 731 | 676 | * @access public |
| 732 | 677 | * |
| 733 | - * @param string $frontend_file_name | |
| 678 | + * @param string $frontend_file_name | |
| 734 | 679 | * @param boolean $custom_file |
| 735 | 680 | * |
| 736 | 681 | * @return string frontend file URL |
| 737 | 682 | */ |
| 738 | - public function get_frontend_file_url( $frontend_file_name, $custom_file, $css_subfolder = '' ) { | |
| 683 | + public function get_frontend_file_url( $frontend_file_name, $custom_file ) { | |
| 739 | 684 | if ( $custom_file ) { |
| 740 | 685 | $frontend_file = $this->get_frontend_file( $frontend_file_name ); |
| 741 | 686 | |
| 742 | 687 | $frontend_file_url = $frontend_file->get_url(); |
| 743 | 688 | } else { |
| 744 | - $frontend_file_url = ELEMENTOR_ASSETS_URL . 'css/' . $css_subfolder . $frontend_file_name; | |
| 689 | + $frontend_file_url = ELEMENTOR_ASSETS_URL . 'css/' . $frontend_file_name; | |
| 745 | 690 | } |
| 746 | 691 | |
| 747 | 692 | return $frontend_file_url; |
| 748 | 693 | } |
| @@ -755,9 +700,9 @@ | ||
| 755 | 700 | * |
| 756 | 701 | * @since 3.5.0 |
| 757 | 702 | * @access public |
| 758 | 703 | * |
| 759 | - * @param string $frontend_file_name | |
| 704 | + * @param string $frontend_file_name | |
| 760 | 705 | * @param boolean $custom_file |
| 761 | 706 | * |
| 762 | 707 | * @return string frontend file path |
| 763 | 708 | */ |
| @@ -900,20 +845,8 @@ | ||
| 900 | 845 | * @since 1.9.4 |
| 901 | 846 | * @access public |
| 902 | 847 | */ |
| 903 | 848 | 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 | 849 | $google_fonts = $this->get_list_of_google_fonts_by_type(); |
| 917 | 850 | |
| 918 | 851 | $this->enqueue_google_fonts( $google_fonts ); |
| 919 | 852 | $this->enqueue_icon_fonts(); |
| @@ -944,9 +877,9 @@ | ||
| 944 | 877 | wp_enqueue_style( 'elementor-icons-' . $icon_type ); |
| 945 | 878 | $this->enqueued_icon_fonts[] = $css_url; |
| 946 | 879 | } |
| 947 | 880 | |
| 948 | - // Clear enqueued icons. | |
| 881 | + //clear enqueued icons | |
| 949 | 882 | $this->icon_fonts_to_enqueue = []; |
| 950 | 883 | } |
| 951 | 884 | |
| 952 | 885 | /** |
| @@ -1044,21 +977,29 @@ | ||
| 1044 | 977 | if ( ! $print_google_fonts ) { |
| 1045 | 978 | return; |
| 1046 | 979 | } |
| 1047 | 980 | |
| 1048 | - $force_enqueue_from_cdn = Plugin::$instance->preview->is_preview_mode(); | |
| 981 | + // Print used fonts | |
| 982 | + if ( ! empty( $google_fonts['google'] ) ) { | |
| 983 | + $this->google_fonts_index++; | |
| 1049 | 984 | |
| 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 | - } | |
| 985 | + $fonts_url = $this->get_stable_google_fonts_url( $google_fonts['google'] ); | |
| 986 | + | |
| 987 | + wp_enqueue_style( 'google-fonts-' . $this->google_fonts_index, $fonts_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1054 | 988 | } |
| 1055 | 989 | |
| 1056 | 990 | 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 ); | |
| 991 | + $early_access_font_urls = $this->get_early_access_google_font_urls( $google_fonts['early'] ); | |
| 992 | + | |
| 993 | + foreach ( $early_access_font_urls as $ea_font_url ) { | |
| 994 | + $this->google_fonts_index++; | |
| 995 | + | |
| 996 | + //printf( '<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/earlyaccess/%s.css">', strtolower( str_replace( ' ', '', $current_font ) ) ); | |
| 997 | + | |
| 998 | + wp_enqueue_style( 'google-earlyaccess-' . $this->google_fonts_index, $ea_font_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1059 | 999 | } |
| 1060 | 1000 | } |
| 1001 | + | |
| 1061 | 1002 | } |
| 1062 | 1003 | |
| 1063 | 1004 | /** |
| 1064 | 1005 | * Enqueue fonts. |
| @@ -1079,8 +1020,22 @@ | ||
| 1079 | 1020 | $this->registered_fonts[] = $font; |
| 1080 | 1021 | } |
| 1081 | 1022 | |
| 1082 | 1023 | /** |
| 1024 | + * Parse global CSS. | |
| 1025 | + * | |
| 1026 | + * Enqueue the global CSS file. | |
| 1027 | + * | |
| 1028 | + * @since 1.2.0 | |
| 1029 | + * @access protected | |
| 1030 | + */ | |
| 1031 | + protected function parse_global_css_code() { | |
| 1032 | + $scheme_css_file = Global_CSS::create( 'global.css' ); | |
| 1033 | + | |
| 1034 | + $scheme_css_file->enqueue(); | |
| 1035 | + } | |
| 1036 | + | |
| 1037 | + /** | |
| 1083 | 1038 | * Apply builder in content. |
| 1084 | 1039 | * |
| 1085 | 1040 | * Used to apply the Elementor page editor on the post content. |
| 1086 | 1041 | * |
| @@ -1147,21 +1102,8 @@ | ||
| 1147 | 1102 | |
| 1148 | 1103 | $data = $document->get_elements_data(); |
| 1149 | 1104 | |
| 1150 | 1105 | /** |
| 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 | 1106 | * Frontend builder content data. |
| 1165 | 1107 | * |
| 1166 | 1108 | * Filters the builder content in the frontend. |
| 1167 | 1109 | * |
| @@ -1257,9 +1199,9 @@ | ||
| 1257 | 1199 | * |
| 1258 | 1200 | * @since 1.0.0 |
| 1259 | 1201 | * @access public |
| 1260 | 1202 | * |
| 1261 | - * @param int $post_id The post ID. | |
| 1203 | + * @param int $post_id The post ID. | |
| 1262 | 1204 | * |
| 1263 | 1205 | * @param bool $with_css Optional. Whether to retrieve the content with CSS |
| 1264 | 1206 | * or not. Default is false. |
| 1265 | 1207 | * |
| @@ -1425,9 +1367,9 @@ | ||
| 1425 | 1367 | 'isScriptDebug' => Utils::is_script_debug(), |
| 1426 | 1368 | ], |
| 1427 | 1369 | 'i18n' => [ |
| 1428 | 1370 | 'shareOnFacebook' => esc_html__( 'Share on Facebook', 'elementor' ), |
| 1429 | - 'shareOnX' => esc_html__( 'Share on X', 'elementor' ), | |
| 1371 | + 'shareOnTwitter' => esc_html__( 'Share on Twitter', 'elementor' ), | |
| 1430 | 1372 | 'pinIt' => esc_html__( 'Pin it', 'elementor' ), |
| 1431 | 1373 | 'download' => esc_html__( 'Download', 'elementor' ), |
| 1432 | 1374 | 'downloadImage' => esc_html__( 'Download image', 'elementor' ), |
| 1433 | 1375 | 'fullscreen' => esc_html__( 'Fullscreen', 'elementor' ), |
| @@ -1436,8 +1378,9 @@ | ||
| 1436 | 1378 | 'playVideo' => esc_html__( 'Play Video', 'elementor' ), |
| 1437 | 1379 | 'previous' => esc_html__( 'Previous', 'elementor' ), |
| 1438 | 1380 | 'next' => esc_html__( 'Next', 'elementor' ), |
| 1439 | 1381 | 'close' => esc_html__( 'Close', 'elementor' ), |
| 1382 | + 'a11yCarouselWrapperAriaLabel' => __( 'Carousel | Horizontal scrolling: Arrow Left & Right', 'elementor' ), | |
| 1440 | 1383 | 'a11yCarouselPrevSlideMessage' => __( 'Previous slide', 'elementor' ), |
| 1441 | 1384 | 'a11yCarouselNextSlideMessage' => __( 'Next slide', 'elementor' ), |
| 1442 | 1385 | 'a11yCarouselFirstSlideMessage' => __( 'This is the first slide', 'elementor' ), |
| 1443 | 1386 | 'a11yCarouselLastSlideMessage' => __( 'This is the last slide', 'elementor' ), |
| @@ -1448,9 +1391,8 @@ | ||
| 1448 | 1391 | 'breakpoints' => Responsive::get_breakpoints(), |
| 1449 | 1392 | // 'responsive' contains the custom breakpoints config introduced in Elementor v3.2.0 |
| 1450 | 1393 | 'responsive' => [ |
| 1451 | 1394 | 'breakpoints' => Plugin::$instance->breakpoints->get_breakpoints_config(), |
| 1452 | - 'hasCustomBreakpoints' => Plugin::$instance->breakpoints->has_custom_breakpoints(), | |
| 1453 | 1395 | ], |
| 1454 | 1396 | 'version' => ELEMENTOR_VERSION, |
| 1455 | 1397 | 'is_static' => $this->is_static_render_mode(), |
| 1456 | 1398 | 'experimentalFeatures' => $active_experimental_features, |
| @@ -1455,16 +1397,10 @@ | ||
| 1455 | 1397 | 'is_static' => $this->is_static_render_mode(), |
| 1456 | 1398 | 'experimentalFeatures' => $active_experimental_features, |
| 1457 | 1399 | 'urls' => [ |
| 1458 | 1400 | 'assets' => $assets_url, |
| 1459 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), | |
| 1460 | - 'uploadUrl' => wp_upload_dir()['baseurl'], | |
| 1461 | 1401 | ], |
| 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', | |
| 1402 | + 'swiperClass' => Plugin::$instance->experiments->is_feature_active( 'e_swiper_latest' ) ? 'swiper' : 'swiper-container', | |
| 1467 | 1403 | ]; |
| 1468 | 1404 | |
| 1469 | 1405 | $settings['settings'] = SettingsManager::get_settings_frontend_config(); |
| 1470 | 1406 | |
| @@ -1546,9 +1482,9 @@ | ||
| 1546 | 1482 | * |
| 1547 | 1483 | * @access private |
| 1548 | 1484 | * @since 2.0.4 |
| 1549 | 1485 | * |
| 1550 | - * @param string $content | |
| 1486 | + * @param $content | |
| 1551 | 1487 | * |
| 1552 | 1488 | * @return string |
| 1553 | 1489 | */ |
| 1554 | 1490 | private function process_more_tag( $content ) { |
| @@ -1596,6 +1532,40 @@ | ||
| 1596 | 1532 | */ |
| 1597 | 1533 | $more_link = apply_filters( 'the_content_more_link', $more_link, $more_link_text ); |
| 1598 | 1534 | |
| 1599 | 1535 | return force_balance_tags( $parts['main'] ) . $more_link; |
| 1536 | + } | |
| 1537 | + | |
| 1538 | + private function is_improved_assets_loading() { | |
| 1539 | + return Plugin::$instance->experiments->is_feature_active( 'e_optimized_assets_loading' ); | |
| 1540 | + } | |
| 1541 | + | |
| 1542 | + private function get_elementor_frontend_dependencies() { | |
| 1543 | + $dependencies = [ | |
| 1544 | + 'elementor-frontend-modules', | |
| 1545 | + 'elementor-waypoints', | |
| 1546 | + 'jquery-ui-position', | |
| 1547 | + ]; | |
| 1548 | + | |
| 1549 | + if ( ! $this->is_improved_assets_loading() ) { | |
| 1550 | + wp_register_script( | |
| 1551 | + 'swiper', | |
| 1552 | + $this->get_js_assets_url( 'swiper', $this->e_swiper_asset_path ), | |
| 1553 | + [], | |
| 1554 | + $this->e_swiper_version, | |
| 1555 | + true | |
| 1556 | + ); | |
| 1557 | + | |
| 1558 | + $dependencies[] = 'swiper'; | |
| 1559 | + $dependencies[] = 'share-link'; | |
| 1560 | + $dependencies[] = 'elementor-dialog'; | |
| 1561 | + } | |
| 1562 | + | |
| 1563 | + return $dependencies; | |
| 1564 | + } | |
| 1565 | + | |
| 1566 | + private function is_optimized_css_mode() { | |
| 1567 | + $is_optimized_css_loading = Plugin::$instance->experiments->is_feature_active( 'e_optimized_css_loading' ); | |
| 1568 | + | |
| 1569 | + return ! Utils::is_script_debug() && $is_optimized_css_loading && ! Plugin::$instance->preview->is_preview_mode(); | |
| 1600 | 1570 | } |
| 1601 | 1571 | } |
