| @@ -2,9 +2,8 @@ | ||
| 2 | 2 | namespace Elementor; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Core\Base\App; |
| 5 | 5 | use Elementor\Core\Base\Elements_Iteration_Actions\Assets; |
| 6 | -use Elementor\Core\Files\Fonts\Google_Font; | |
| 7 | 6 | use Elementor\Core\Frontend\Render_Mode_Manager; |
| 8 | 7 | use Elementor\Core\Responsive\Files\Frontend as FrontendFile; |
| 9 | 8 | use Elementor\Core\Files\CSS\Post as Post_CSS; |
| 10 | 9 | use Elementor\Core\Files\CSS\Post_Preview; |
| @@ -146,9 +145,21 @@ | ||
| 146 | 145 | private $body_classes = [ |
| 147 | 146 | 'elementor-default', |
| 148 | 147 | ]; |
| 149 | 148 | |
| 149 | + private $google_fonts_index = 0; | |
| 150 | + | |
| 150 | 151 | /** |
| 152 | + * @var string | |
| 153 | + */ | |
| 154 | + private $e_swiper_asset_path; | |
| 155 | + | |
| 156 | + /** | |
| 157 | + * @var string | |
| 158 | + */ | |
| 159 | + private $e_swiper_version; | |
| 160 | + | |
| 161 | + /** | |
| 151 | 162 | * Front End constructor. |
| 152 | 163 | * |
| 153 | 164 | * Initializing Elementor front end. Make sure we are not in admin, not and |
| 154 | 165 | * redirect from old URL structure of Elementor editor. |
| @@ -167,16 +178,13 @@ | ||
| 167 | 178 | add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ], 5 ); |
| 168 | 179 | add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 5 ); |
| 169 | 180 | |
| 170 | 181 | $this->add_content_filter(); |
| 182 | + $this->init_swiper_settings(); | |
| 171 | 183 | |
| 172 | 184 | // Hack to avoid enqueue post CSS while it's a `the_excerpt` call. |
| 173 | 185 | add_filter( 'get_the_excerpt', [ $this, 'start_excerpt_flag' ], 1 ); |
| 174 | 186 | 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 | 187 | } |
| 180 | 188 | |
| 181 | 189 | /** |
| 182 | 190 | * Get module name. |
| @@ -238,22 +246,31 @@ | ||
| 238 | 246 | } |
| 239 | 247 | |
| 240 | 248 | // Priority 7 to allow google fonts in header template to load in <head> tag |
| 241 | 249 | add_action( 'wp_head', [ $this, 'print_fonts_links' ], 7 ); |
| 250 | + add_action( 'wp_head', [ $this, 'print_google_fonts_preconnect_tag' ], 8 ); | |
| 242 | 251 | add_action( 'wp_head', [ $this, 'add_theme_color_meta_tag' ] ); |
| 243 | 252 | add_action( 'wp_footer', [ $this, 'wp_footer' ] ); |
| 244 | 253 | } |
| 245 | 254 | |
| 255 | + public function print_google_fonts_preconnect_tag() { | |
| 256 | + if ( 0 >= $this->google_fonts_index ) { | |
| 257 | + return; | |
| 258 | + } | |
| 259 | + | |
| 260 | + echo '<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>'; | |
| 261 | + } | |
| 262 | + | |
| 246 | 263 | /** |
| 247 | 264 | * @since 2.0.12 |
| 248 | 265 | * @access public |
| 249 | - * @param string|array $class_name | |
| 266 | + * @param string|array $class | |
| 250 | 267 | */ |
| 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 ); | |
| 268 | + public function add_body_class( $class ) { | |
| 269 | + if ( is_array( $class ) ) { | |
| 270 | + $this->body_classes = array_merge( $this->body_classes, $class ); | |
| 254 | 271 | } else { |
| 255 | - $this->body_classes[] = $class_name; | |
| 272 | + $this->body_classes[] = $class; | |
| 256 | 273 | } |
| 257 | 274 | } |
| 258 | 275 | |
| 259 | 276 | /** |
| @@ -323,8 +340,13 @@ | ||
| 323 | 340 | public function add_content_filter() { |
| 324 | 341 | add_filter( 'the_content', [ $this, 'apply_builder_in_content' ], self::THE_CONTENT_FILTER_PRIORITY ); |
| 325 | 342 | } |
| 326 | 343 | |
| 344 | + public function init_swiper_settings() { | |
| 345 | + $this->e_swiper_asset_path = 'assets/lib/swiper/v8/'; | |
| 346 | + $this->e_swiper_version = '8.4.5'; | |
| 347 | + } | |
| 348 | + | |
| 327 | 349 | /** |
| 328 | 350 | * Remove content filter. |
| 329 | 351 | * |
| 330 | 352 | * When the Elementor generated content rendered, we remove the filter to prevent multiple |
| @@ -376,16 +398,8 @@ | ||
| 376 | 398 | true |
| 377 | 399 | ); |
| 378 | 400 | |
| 379 | 401 | wp_register_script( |
| 380 | - 'swiper', | |
| 381 | - $this->get_js_assets_url( 'swiper', 'assets/lib/swiper/v8/' ), | |
| 382 | - [], | |
| 383 | - '8.4.5', | |
| 384 | - true | |
| 385 | - ); | |
| 386 | - | |
| 387 | - wp_register_script( | |
| 388 | 402 | 'flatpickr', |
| 389 | 403 | $this->get_js_assets_url( 'flatpickr', 'assets/lib/flatpickr/' ), |
| 390 | 404 | [ |
| 391 | 405 | 'jquery', |
| @@ -419,9 +433,9 @@ | ||
| 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.9.3', | |
| 424 | 438 | true |
| 425 | 439 | ); |
| 426 | 440 | |
| 427 | 441 | wp_register_script( |
| @@ -454,10 +468,8 @@ | ||
| 454 | 468 | ELEMENTOR_VERSION, |
| 455 | 469 | true |
| 456 | 470 | ); |
| 457 | 471 | |
| 458 | - $this->register_frontend_handlers(); | |
| 459 | - | |
| 460 | 472 | /** |
| 461 | 473 | * After frontend register scripts. |
| 462 | 474 | * |
| 463 | 475 | * Fires after Elementor frontend scripts are registered. |
| @@ -534,11 +546,11 @@ | ||
| 534 | 546 | ); |
| 535 | 547 | |
| 536 | 548 | wp_register_style( |
| 537 | 549 | 'swiper', |
| 538 | - $this->get_css_assets_url( 'swiper', 'assets/lib/swiper/v8/css/' ), | |
| 550 | + $this->get_css_assets_url( 'swiper', $this->e_swiper_asset_path . 'css/' ), | |
| 539 | 551 | [], |
| 540 | - '8.4.5' | |
| 552 | + $this->e_swiper_version | |
| 541 | 553 | ); |
| 542 | 554 | |
| 543 | 555 | wp_register_style( |
| 544 | 556 | 'elementor-wp-admin-bar', |
| @@ -555,9 +567,9 @@ | ||
| 555 | 567 | ); |
| 556 | 568 | |
| 557 | 569 | wp_register_style( |
| 558 | 570 | 'elementor-frontend', |
| 559 | - $this->get_frontend_file_url( "frontend{$min_suffix}.css", $has_custom_breakpoints ), | |
| 571 | + $this->get_frontend_file_url( "frontend{$direction_suffix}{$min_suffix}.css", $has_custom_breakpoints ), | |
| 560 | 572 | [], |
| 561 | 573 | $has_custom_breakpoints ? null : ELEMENTOR_VERSION |
| 562 | 574 | ); |
| 563 | 575 | |
| @@ -591,23 +603,8 @@ | ||
| 591 | 603 | do_action( 'elementor/frontend/after_register_styles' ); |
| 592 | 604 | } |
| 593 | 605 | |
| 594 | 606 | /** |
| 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 | 607 | * Enqueue scripts. |
| 611 | 608 | * |
| 612 | 609 | * Enqueue all the frontend scripts. |
| 613 | 610 | * |
| @@ -623,8 +620,10 @@ | ||
| 623 | 620 | * @since 1.0.0 |
| 624 | 621 | */ |
| 625 | 622 | do_action( 'elementor/frontend/before_enqueue_scripts' ); |
| 626 | 623 | |
| 624 | + wp_enqueue_script( 'elementor-frontend' ); | |
| 625 | + | |
| 627 | 626 | $this->print_config(); |
| 628 | 627 | |
| 629 | 628 | $this->enqueue_conditional_assets(); |
| 630 | 629 | |
| @@ -686,41 +685,20 @@ | ||
| 686 | 685 | if ( ! Plugin::$instance->preview->is_preview_mode() ) { |
| 687 | 686 | $post_id = get_the_ID(); |
| 688 | 687 | // Check $post_id for virtual pages. check is singular because the $post_id is set to the first post on archive pages. |
| 689 | 688 | if ( $post_id && is_singular() ) { |
| 690 | - do_action( 'elementor/post/render', $post_id ); | |
| 691 | - $this->handle_page_assets( $post_id ); | |
| 689 | + $page_assets = get_post_meta( $post_id, Assets::ASSETS_META_KEY, true ); | |
| 690 | + if ( ! empty( $page_assets ) ) { | |
| 691 | + Plugin::$instance->assets_loader->enable_assets( $page_assets ); | |
| 692 | + } | |
| 692 | 693 | |
| 693 | 694 | $css_file = Post_CSS::create( get_the_ID() ); |
| 694 | 695 | $css_file->enqueue(); |
| 695 | 696 | } |
| 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 | 697 | } |
| 702 | - | |
| 703 | - do_action( 'elementor/frontend/after_enqueue_post_styles' ); | |
| 704 | 698 | } |
| 705 | 699 | } |
| 706 | 700 | |
| 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 | 701 | /** |
| 724 | 702 | * Get Frontend File URL |
| 725 | 703 | * |
| 726 | 704 | * Returns the URL for the CSS file to be loaded in the front end. If requested via the second parameter, a custom |
| @@ -729,9 +707,9 @@ | ||
| 729 | 707 | * @since 3.4.5 |
| 730 | 708 | * |
| 731 | 709 | * @access public |
| 732 | 710 | * |
| 733 | - * @param string $frontend_file_name | |
| 711 | + * @param string $frontend_file_name | |
| 734 | 712 | * @param boolean $custom_file |
| 735 | 713 | * |
| 736 | 714 | * @return string frontend file URL |
| 737 | 715 | */ |
| @@ -755,9 +733,9 @@ | ||
| 755 | 733 | * |
| 756 | 734 | * @since 3.5.0 |
| 757 | 735 | * @access public |
| 758 | 736 | * |
| 759 | - * @param string $frontend_file_name | |
| 737 | + * @param string $frontend_file_name | |
| 760 | 738 | * @param boolean $custom_file |
| 761 | 739 | * |
| 762 | 740 | * @return string frontend file path |
| 763 | 741 | */ |
| @@ -900,20 +878,8 @@ | ||
| 900 | 878 | * @since 1.9.4 |
| 901 | 879 | * @access public |
| 902 | 880 | */ |
| 903 | 881 | 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 | 882 | $google_fonts = $this->get_list_of_google_fonts_by_type(); |
| 917 | 883 | |
| 918 | 884 | $this->enqueue_google_fonts( $google_fonts ); |
| 919 | 885 | $this->enqueue_icon_fonts(); |
| @@ -944,9 +910,9 @@ | ||
| 944 | 910 | wp_enqueue_style( 'elementor-icons-' . $icon_type ); |
| 945 | 911 | $this->enqueued_icon_fonts[] = $css_url; |
| 946 | 912 | } |
| 947 | 913 | |
| 948 | - // Clear enqueued icons. | |
| 914 | + //clear enqueued icons | |
| 949 | 915 | $this->icon_fonts_to_enqueue = []; |
| 950 | 916 | } |
| 951 | 917 | |
| 952 | 918 | /** |
| @@ -1044,21 +1010,29 @@ | ||
| 1044 | 1010 | if ( ! $print_google_fonts ) { |
| 1045 | 1011 | return; |
| 1046 | 1012 | } |
| 1047 | 1013 | |
| 1048 | - $force_enqueue_from_cdn = Plugin::$instance->preview->is_preview_mode(); | |
| 1014 | + // Print used fonts | |
| 1015 | + if ( ! empty( $google_fonts['google'] ) ) { | |
| 1016 | + $this->google_fonts_index++; | |
| 1049 | 1017 | |
| 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 | - } | |
| 1018 | + $fonts_url = $this->get_stable_google_fonts_url( $google_fonts['google'] ); | |
| 1019 | + | |
| 1020 | + wp_enqueue_style( 'google-fonts-' . $this->google_fonts_index, $fonts_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1054 | 1021 | } |
| 1055 | 1022 | |
| 1056 | 1023 | 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 ); | |
| 1024 | + $early_access_font_urls = $this->get_early_access_google_font_urls( $google_fonts['early'] ); | |
| 1025 | + | |
| 1026 | + foreach ( $early_access_font_urls as $ea_font_url ) { | |
| 1027 | + $this->google_fonts_index++; | |
| 1028 | + | |
| 1029 | + //printf( '<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/earlyaccess/%s.css">', strtolower( str_replace( ' ', '', $current_font ) ) ); | |
| 1030 | + | |
| 1031 | + wp_enqueue_style( 'google-earlyaccess-' . $this->google_fonts_index, $ea_font_url ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion | |
| 1059 | 1032 | } |
| 1060 | 1033 | } |
| 1034 | + | |
| 1061 | 1035 | } |
| 1062 | 1036 | |
| 1063 | 1037 | /** |
| 1064 | 1038 | * Enqueue fonts. |
| @@ -1147,21 +1121,8 @@ | ||
| 1147 | 1121 | |
| 1148 | 1122 | $data = $document->get_elements_data(); |
| 1149 | 1123 | |
| 1150 | 1124 | /** |
| 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 | 1125 | * Frontend builder content data. |
| 1165 | 1126 | * |
| 1166 | 1127 | * Filters the builder content in the frontend. |
| 1167 | 1128 | * |
| @@ -1257,9 +1218,9 @@ | ||
| 1257 | 1218 | * |
| 1258 | 1219 | * @since 1.0.0 |
| 1259 | 1220 | * @access public |
| 1260 | 1221 | * |
| 1261 | - * @param int $post_id The post ID. | |
| 1222 | + * @param int $post_id The post ID. | |
| 1262 | 1223 | * |
| 1263 | 1224 | * @param bool $with_css Optional. Whether to retrieve the content with CSS |
| 1264 | 1225 | * or not. Default is false. |
| 1265 | 1226 | * |
| @@ -1460,9 +1421,8 @@ | ||
| 1460 | 1421 | 'uploadUrl' => wp_upload_dir()['baseurl'], |
| 1461 | 1422 | ], |
| 1462 | 1423 | 'nonces' => [ |
| 1463 | 1424 | 'floatingButtonsClickTracking' => wp_create_nonce( Module::CLICK_TRACKING_NONCE ), |
| 1464 | - 'atomicFormsSendForm' => wp_create_nonce( 'elementor_pro_atomic_forms_send_form' ), | |
| 1465 | 1425 | ], |
| 1466 | 1426 | 'swiperClass' => 'swiper', |
| 1467 | 1427 | ]; |
| 1468 | 1428 | |
| @@ -1546,9 +1506,9 @@ | ||
| 1546 | 1506 | * |
| 1547 | 1507 | * @access private |
| 1548 | 1508 | * @since 2.0.4 |
| 1549 | 1509 | * |
| 1550 | - * @param string $content | |
| 1510 | + * @param $content | |
| 1551 | 1511 | * |
| 1552 | 1512 | * @return string |
| 1553 | 1513 | */ |
| 1554 | 1514 | private function process_more_tag( $content ) { |
