| @@ -1,16 +1,23 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | namespace Elementor\Core\Editor; |
| 3 | 3 | |
| 4 | +use Elementor\Api; | |
| 5 | +use Elementor\Core\Breakpoints\Breakpoint; | |
| 4 | 6 | use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager; |
| 5 | 7 | use Elementor\Core\Common\Modules\Ajax\Module; |
| 8 | +use Elementor\Core\Common\Modules\Ajax\Module as Ajax; | |
| 6 | 9 | use Elementor\Core\Debug\Loading_Inspection_Manager; |
| 7 | -use Elementor\Core\Editor\Loader\Editor_Loader; | |
| 8 | -use Elementor\Core\Utils\Assets_Config_Provider; | |
| 9 | -use Elementor\Core\Utils\Collection; | |
| 10 | +use Elementor\Core\Files\Uploads_Manager; | |
| 11 | +use Elementor\Core\Schemes\Manager as Schemes_Manager; | |
| 10 | 12 | use Elementor\Core\Settings\Manager as SettingsManager; |
| 13 | +use Elementor\Icons_Manager; | |
| 11 | 14 | use Elementor\Plugin; |
| 15 | +use Elementor\Settings; | |
| 16 | +use Elementor\Shapes; | |
| 12 | 17 | use Elementor\TemplateLibrary\Source_Local; |
| 18 | +use Elementor\Tools; | |
| 19 | +use Elementor\User; | |
| 13 | 20 | use Elementor\Utils; |
| 14 | 21 | use Elementor\Core\Editor\Data; |
| 15 | 22 | |
| 16 | 23 | if ( ! defined( 'ABSPATH' ) ) { |
| @@ -61,18 +68,8 @@ | ||
| 61 | 68 | */ |
| 62 | 69 | public $notice_bar; |
| 63 | 70 | |
| 64 | 71 | /** |
| 65 | - * @var Promotion | |
| 66 | - */ | |
| 67 | - public $promotion; | |
| 68 | - | |
| 69 | - /** | |
| 70 | - * @var Editor_Loader | |
| 71 | - */ | |
| 72 | - private $loader; | |
| 73 | - | |
| 74 | - /** | |
| 75 | 72 | * Init. |
| 76 | 73 | * |
| 77 | 74 | * Initialize Elementor editor. Registers all needed actions to run Elementor, |
| 78 | 75 | * removes conflicting actions etc. |
| @@ -81,11 +78,11 @@ | ||
| 81 | 78 | * |
| 82 | 79 | * @since 1.0.0 |
| 83 | 80 | * @access public |
| 84 | 81 | * |
| 85 | - * @param bool $to_die Optional. Whether to die at the end. Default is `true`. | |
| 82 | + * @param bool $die Optional. Whether to die at the end. Default is `true`. | |
| 86 | 83 | */ |
| 87 | - public function init( $to_die = true ) { | |
| 84 | + public function init( $die = true ) { | |
| 88 | 85 | if ( empty( $_REQUEST['post'] ) ) { |
| 89 | 86 | return; |
| 90 | 87 | } |
| 91 | 88 | |
| @@ -117,10 +114,8 @@ | ||
| 117 | 114 | |
| 118 | 115 | // Send MIME Type header like WP admin-header. |
| 119 | 116 | @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); |
| 120 | 117 | |
| 121 | - self::send_document_isolation_policy_header(); | |
| 122 | - | |
| 123 | 118 | add_filter( 'show_admin_bar', '__return_false' ); |
| 124 | 119 | |
| 125 | 120 | // Remove all WordPress actions |
| 126 | 121 | remove_all_actions( 'wp_head' ); |
| @@ -159,12 +154,12 @@ | ||
| 159 | 154 | Utils::do_not_cache(); |
| 160 | 155 | |
| 161 | 156 | do_action( 'elementor/editor/init' ); |
| 162 | 157 | |
| 163 | - $this->get_loader()->print_root_template(); | |
| 158 | + $this->print_editor_template(); | |
| 164 | 159 | |
| 165 | 160 | // From the action it's an empty string, from tests its `false` |
| 166 | - if ( false !== $to_die ) { | |
| 161 | + if ( false !== $die ) { | |
| 167 | 162 | die; |
| 168 | 163 | } |
| 169 | 164 | } |
| 170 | 165 | |
| @@ -212,67 +207,8 @@ | ||
| 212 | 207 | die; |
| 213 | 208 | } |
| 214 | 209 | |
| 215 | 210 | /** |
| 216 | - * Whether the current request targets the Elementor editor. | |
| 217 | - * | |
| 218 | - * Unlike `is_edit_mode()`, this is not affected by temporary `set_edit_mode()` overrides. | |
| 219 | - * | |
| 220 | - * @since 4.1.0 | |
| 221 | - * @access public | |
| 222 | - * | |
| 223 | - * @return bool Whether the current request targets the Elementor editor. | |
| 224 | - */ | |
| 225 | - public function is_editor_request() { | |
| 226 | - $common = Plugin::$instance->common; | |
| 227 | - | |
| 228 | - if ( $common ) { | |
| 229 | - /** @var Module ajax */ | |
| 230 | - $ajax_data = $common->get_component( 'ajax' )->get_current_action_data(); | |
| 231 | - | |
| 232 | - if ( ! empty( $ajax_data ) && 'get_document_config' === $ajax_data['action'] ) { | |
| 233 | - return true; | |
| 234 | - } | |
| 235 | - } | |
| 236 | - | |
| 237 | - if ( $this->is_editor_admin_screen() ) { | |
| 238 | - return true; | |
| 239 | - } | |
| 240 | - | |
| 241 | - return $this->is_editor_ajax_request(); | |
| 242 | - } | |
| 243 | - | |
| 244 | - private function is_editor_admin_screen(): bool { | |
| 245 | - if ( ! function_exists( 'get_current_screen' ) ) { | |
| 246 | - return false; | |
| 247 | - } | |
| 248 | - | |
| 249 | - $screen = get_current_screen(); | |
| 250 | - | |
| 251 | - if ( ! $screen ) { | |
| 252 | - return false; | |
| 253 | - } | |
| 254 | - | |
| 255 | - return isset( $_GET['action'] ) && 'elementor' === $_GET['action'] && in_array( $screen->base, [ 'post', 'toplevel_page_elementor' ], true ); | |
| 256 | - } | |
| 257 | - | |
| 258 | - private function is_editor_ajax_request(): bool { | |
| 259 | - $actions = apply_filters( 'elementor/editor/ajax_actions', [ | |
| 260 | - 'elementor', | |
| 261 | - | |
| 262 | - // Templates | |
| 263 | - 'elementor_get_templates', | |
| 264 | - 'elementor_save_template', | |
| 265 | - 'elementor_get_template', | |
| 266 | - 'elementor_delete_template', | |
| 267 | - 'elementor_import_template', | |
| 268 | - 'elementor_library_direct_actions', | |
| 269 | - ] ); | |
| 270 | - | |
| 271 | - return isset( $_REQUEST['action'] ) && in_array( $_REQUEST['action'], $actions, true ); | |
| 272 | - } | |
| 273 | - | |
| 274 | - /** | |
| 275 | 211 | * Whether the edit mode is active. |
| 276 | 212 | * |
| 277 | 213 | * Used to determine whether we are in the edit mode. |
| 278 | 214 | * |
| @@ -369,10 +305,8 @@ | ||
| 369 | 305 | return get_user_by( 'id', $locked_user ); |
| 370 | 306 | } |
| 371 | 307 | |
| 372 | 308 | /** |
| 373 | - * NOTICE: This method not in use, it's here for backward compatibility. | |
| 374 | - * | |
| 375 | 309 | * Print Editor Template. |
| 376 | 310 | * |
| 377 | 311 | * Include the wrapper template of the editor. |
| 378 | 312 | * |
| @@ -395,14 +329,173 @@ | ||
| 395 | 329 | remove_action( 'wp_enqueue_scripts', [ $this, __FUNCTION__ ], 999999 ); |
| 396 | 330 | |
| 397 | 331 | global $wp_styles, $wp_scripts; |
| 398 | 332 | |
| 333 | + $plugin = Plugin::$instance; | |
| 334 | + | |
| 399 | 335 | // Reset global variable |
| 400 | 336 | $wp_styles = new \WP_Styles(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited |
| 401 | 337 | $wp_scripts = new \WP_Scripts(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited |
| 402 | 338 | |
| 403 | - $this->get_loader()->register_scripts(); | |
| 339 | + $suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || defined( 'ELEMENTOR_TESTS' ) && ELEMENTOR_TESTS ) ? '' : '.min'; | |
| 404 | 340 | |
| 341 | + wp_register_script( | |
| 342 | + 'elementor-editor-modules', | |
| 343 | + ELEMENTOR_ASSETS_URL . 'js/editor-modules' . $suffix . '.js', | |
| 344 | + [ | |
| 345 | + 'elementor-common-modules', | |
| 346 | + ], | |
| 347 | + ELEMENTOR_VERSION, | |
| 348 | + true | |
| 349 | + ); | |
| 350 | + | |
| 351 | + wp_register_script( | |
| 352 | + 'elementor-editor-document', | |
| 353 | + ELEMENTOR_ASSETS_URL . 'js/editor-document' . $suffix . '.js', | |
| 354 | + [ | |
| 355 | + 'elementor-common-modules', | |
| 356 | + ], | |
| 357 | + ELEMENTOR_VERSION, | |
| 358 | + true | |
| 359 | + ); | |
| 360 | + // Hack for waypoint with editor mode. | |
| 361 | + wp_register_script( | |
| 362 | + 'elementor-waypoints', | |
| 363 | + ELEMENTOR_ASSETS_URL . 'lib/waypoints/waypoints-for-editor.js', | |
| 364 | + [ | |
| 365 | + 'jquery', | |
| 366 | + ], | |
| 367 | + '4.0.2', | |
| 368 | + true | |
| 369 | + ); | |
| 370 | + | |
| 371 | + wp_register_script( | |
| 372 | + 'perfect-scrollbar', | |
| 373 | + ELEMENTOR_ASSETS_URL . 'lib/perfect-scrollbar/js/perfect-scrollbar' . $suffix . '.js', | |
| 374 | + [], | |
| 375 | + '1.4.0', | |
| 376 | + true | |
| 377 | + ); | |
| 378 | + | |
| 379 | + wp_register_script( | |
| 380 | + 'jquery-easing', | |
| 381 | + ELEMENTOR_ASSETS_URL . 'lib/jquery-easing/jquery-easing' . $suffix . '.js', | |
| 382 | + [ | |
| 383 | + 'jquery', | |
| 384 | + ], | |
| 385 | + '1.3.2', | |
| 386 | + true | |
| 387 | + ); | |
| 388 | + | |
| 389 | + wp_register_script( | |
| 390 | + 'nprogress', | |
| 391 | + ELEMENTOR_ASSETS_URL . 'lib/nprogress/nprogress' . $suffix . '.js', | |
| 392 | + [], | |
| 393 | + '0.2.0', | |
| 394 | + true | |
| 395 | + ); | |
| 396 | + | |
| 397 | + wp_register_script( | |
| 398 | + 'tipsy', | |
| 399 | + ELEMENTOR_ASSETS_URL . 'lib/tipsy/tipsy' . $suffix . '.js', | |
| 400 | + [ | |
| 401 | + 'jquery', | |
| 402 | + ], | |
| 403 | + '1.0.0', | |
| 404 | + true | |
| 405 | + ); | |
| 406 | + | |
| 407 | + wp_register_script( | |
| 408 | + 'jquery-elementor-select2', | |
| 409 | + ELEMENTOR_ASSETS_URL . 'lib/e-select2/js/e-select2.full' . $suffix . '.js', | |
| 410 | + [ | |
| 411 | + 'jquery', | |
| 412 | + ], | |
| 413 | + '4.0.6-rc.1', | |
| 414 | + true | |
| 415 | + ); | |
| 416 | + | |
| 417 | + wp_register_script( | |
| 418 | + 'flatpickr', | |
| 419 | + ELEMENTOR_ASSETS_URL . 'lib/flatpickr/flatpickr' . $suffix . '.js', | |
| 420 | + [ | |
| 421 | + 'jquery', | |
| 422 | + ], | |
| 423 | + '1.12.0', | |
| 424 | + true | |
| 425 | + ); | |
| 426 | + | |
| 427 | + wp_register_script( | |
| 428 | + 'ace', | |
| 429 | + 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.5/ace.js', | |
| 430 | + [], | |
| 431 | + '1.2.5', | |
| 432 | + true | |
| 433 | + ); | |
| 434 | + | |
| 435 | + wp_register_script( | |
| 436 | + 'ace-language-tools', | |
| 437 | + 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.5/ext-language_tools.js', | |
| 438 | + [ | |
| 439 | + 'ace', | |
| 440 | + ], | |
| 441 | + '1.2.5', | |
| 442 | + true | |
| 443 | + ); | |
| 444 | + | |
| 445 | + wp_register_script( | |
| 446 | + 'jquery-hover-intent', | |
| 447 | + ELEMENTOR_ASSETS_URL . 'lib/jquery-hover-intent/jquery-hover-intent' . $suffix . '.js', | |
| 448 | + [], | |
| 449 | + '1.0.0', | |
| 450 | + true | |
| 451 | + ); | |
| 452 | + | |
| 453 | + wp_register_script( | |
| 454 | + 'nouislider', | |
| 455 | + ELEMENTOR_ASSETS_URL . 'lib/nouislider/nouislider' . $suffix . '.js', | |
| 456 | + [], | |
| 457 | + '13.0.0', | |
| 458 | + true | |
| 459 | + ); | |
| 460 | + | |
| 461 | + wp_register_script( | |
| 462 | + 'pickr', | |
| 463 | + ELEMENTOR_ASSETS_URL . 'lib/pickr/pickr.min.js', | |
| 464 | + [], | |
| 465 | + '1.5.0', | |
| 466 | + true | |
| 467 | + ); | |
| 468 | + | |
| 469 | + wp_register_script( | |
| 470 | + 'elementor-editor', | |
| 471 | + ELEMENTOR_ASSETS_URL . 'js/editor' . $suffix . '.js', | |
| 472 | + [ | |
| 473 | + 'elementor-common', | |
| 474 | + 'elementor-editor-modules', | |
| 475 | + 'elementor-editor-document', | |
| 476 | + 'wp-auth-check', | |
| 477 | + 'jquery-ui-sortable', | |
| 478 | + 'jquery-ui-resizable', | |
| 479 | + 'perfect-scrollbar', | |
| 480 | + 'nprogress', | |
| 481 | + 'tipsy', | |
| 482 | + 'imagesloaded', | |
| 483 | + 'heartbeat', | |
| 484 | + 'jquery-elementor-select2', | |
| 485 | + 'flatpickr', | |
| 486 | + 'ace', | |
| 487 | + 'ace-language-tools', | |
| 488 | + 'jquery-hover-intent', | |
| 489 | + 'nouislider', | |
| 490 | + 'pickr', | |
| 491 | + 'react', | |
| 492 | + 'react-dom', | |
| 493 | + ], | |
| 494 | + ELEMENTOR_VERSION, | |
| 495 | + true | |
| 496 | + ); | |
| 497 | + | |
| 405 | 498 | /** |
| 406 | 499 | * Before editor enqueue scripts. |
| 407 | 500 | * |
| 408 | 501 | * Fires before Elementor editor scripts are enqueued. |
| @@ -413,13 +506,114 @@ | ||
| 413 | 506 | |
| 414 | 507 | // Tweak for WP Admin menu icons |
| 415 | 508 | wp_print_styles( 'editor-buttons' ); |
| 416 | 509 | |
| 417 | - $this->get_loader()->enqueue_scripts(); | |
| 510 | + $settings = SettingsManager::get_settings_managers_config(); | |
| 511 | + // Moved to document since 2.9.0. | |
| 512 | + unset( $settings['page'] ); | |
| 418 | 513 | |
| 419 | - Plugin::$instance->controls_manager->enqueue_control_scripts(); | |
| 514 | + $document = Plugin::$instance->documents->get_doc_or_auto_save( $this->post_id ); | |
| 515 | + $kits_manager = Plugin::$instance->kits_manager; | |
| 420 | 516 | |
| 517 | + $page_title_selector = $kits_manager->get_current_settings( 'page_title_selector' ); | |
| 518 | + | |
| 519 | + $page_title_selector .= ', .elementor-page-title .elementor-heading-title'; | |
| 520 | + | |
| 521 | + $config = [ | |
| 522 | + 'initial_document' => $document->get_config(), | |
| 523 | + 'version' => ELEMENTOR_VERSION, | |
| 524 | + 'home_url' => home_url(), | |
| 525 | + 'admin_settings_url' => admin_url( 'admin.php?page=' . Settings::PAGE_ID ), | |
| 526 | + 'admin_tools_url' => admin_url( 'admin.php?page=' . Tools::PAGE_ID ), | |
| 527 | + 'autosave_interval' => AUTOSAVE_INTERVAL, | |
| 528 | + 'tabs' => $plugin->controls_manager->get_tabs(), | |
| 529 | + 'controls' => $plugin->controls_manager->get_controls_data(), | |
| 530 | + 'elements' => $plugin->elements_manager->get_element_types_config(), | |
| 531 | + 'schemes' => [ | |
| 532 | + 'items' => $plugin->schemes_manager->get_registered_schemes_data(), | |
| 533 | + 'enabled_schemes' => Schemes_Manager::get_enabled_schemes(), | |
| 534 | + ], | |
| 535 | + 'globals' => [ | |
| 536 | + 'defaults_enabled' => [ | |
| 537 | + 'colors' => $kits_manager->is_custom_colors_enabled(), | |
| 538 | + 'typography' => $kits_manager->is_custom_typography_enabled(), | |
| 539 | + ], | |
| 540 | + ], | |
| 541 | + 'icons' => [ | |
| 542 | + 'libraries' => Icons_Manager::get_icon_manager_tabs_config(), | |
| 543 | + 'goProURL' => Utils::get_pro_link( 'https://elementor.com/pro/?utm_source=icon-library&utm_campaign=gopro&utm_medium=wp-dash' ), | |
| 544 | + ], | |
| 545 | + 'fa4_to_fa5_mapping_url' => ELEMENTOR_ASSETS_URL . 'lib/font-awesome/migration/mapping.js', | |
| 546 | + 'default_schemes' => $plugin->schemes_manager->get_schemes_defaults(), | |
| 547 | + 'settings' => $settings, | |
| 548 | + 'system_schemes' => $plugin->schemes_manager->get_system_schemes(), | |
| 549 | + 'wp_editor' => $this->get_wp_editor_config(), | |
| 550 | + 'settings_page_link' => Settings::get_url(), | |
| 551 | + 'tools_page_link' => Tools::get_url(), | |
| 552 | + 'elementor_site' => 'https://go.elementor.com/about-elementor/', | |
| 553 | + 'docs_elementor_site' => 'https://go.elementor.com/docs/', | |
| 554 | + 'help_the_content_url' => 'https://go.elementor.com/the-content-missing/', | |
| 555 | + 'help_flexbox_bc_url' => 'https://go.elementor.com/flexbox-layout-bc/', | |
| 556 | + 'elementPromotionURL' => 'https://go.elementor.com/go-pro-%s', | |
| 557 | + 'dynamicPromotionURL' => 'https://go.elementor.com/go-pro-dynamic-tag', | |
| 558 | + 'additional_shapes' => Shapes::get_additional_shapes_for_config(), | |
| 559 | + 'user' => [ | |
| 560 | + 'restrictions' => $plugin->role_manager->get_user_restrictions_array(), | |
| 561 | + 'is_administrator' => current_user_can( 'manage_options' ), | |
| 562 | + 'introduction' => User::get_introduction_meta(), | |
| 563 | + ], | |
| 564 | + 'preview' => [ | |
| 565 | + 'help_preview_error_url' => 'https://go.elementor.com/preview-not-loaded/', | |
| 566 | + 'help_preview_http_error_url' => 'https://go.elementor.com/preview-not-loaded/#permissions', | |
| 567 | + 'help_preview_http_error_500_url' => 'https://go.elementor.com/500-error/', | |
| 568 | + 'debug_data' => Loading_Inspection_Manager::instance()->run_inspections(), | |
| 569 | + ], | |
| 570 | + 'locale' => get_locale(), | |
| 571 | + 'rich_editing_enabled' => filter_var( get_user_meta( get_current_user_id(), 'rich_editing', true ), FILTER_VALIDATE_BOOLEAN ), | |
| 572 | + 'page_title_selector' => $page_title_selector, | |
| 573 | + 'tinymceHasCustomConfig' => class_exists( 'Tinymce_Advanced' ) || class_exists( 'Advanced_Editor_Tools' ), | |
| 574 | + 'inlineEditing' => Plugin::$instance->widgets_manager->get_inline_editing_config(), | |
| 575 | + 'dynamicTags' => Plugin::$instance->dynamic_tags->get_config(), | |
| 576 | + 'ui' => [ | |
| 577 | + 'darkModeStylesheetURL' => ELEMENTOR_ASSETS_URL . 'css/editor-dark-mode' . $suffix . '.css', | |
| 578 | + 'defaultGenericFonts' => $kits_manager->get_current_settings( 'default_generic_fonts' ), | |
| 579 | + ], | |
| 580 | + // Empty array for BC to avoid errors. | |
| 581 | + 'i18n' => [], | |
| 582 | + // 'responsive' contains the custom breakpoints config introduced in Elementor v3.2.0 | |
| 583 | + 'responsive' => [ | |
| 584 | + 'breakpoints' => Plugin::$instance->breakpoints->get_breakpoints_config(), | |
| 585 | + 'icons_map' => Plugin::$instance->breakpoints->get_responsive_icons_classes_map(), | |
| 586 | + ], | |
| 587 | + ]; | |
| 588 | + | |
| 589 | + if ( ! Utils::has_pro() && current_user_can( 'manage_options' ) ) { | |
| 590 | + $config['promotionWidgets'] = Api::get_promotion_widgets(); | |
| 591 | + } | |
| 592 | + | |
| 593 | + $this->bc_move_document_filters(); | |
| 594 | + | |
| 421 | 595 | /** |
| 596 | + * Localize editor settings. | |
| 597 | + * | |
| 598 | + * Filters the editor localized settings. | |
| 599 | + * | |
| 600 | + * @since 1.0.0 | |
| 601 | + * | |
| 602 | + * @param array $config Editor configuration. | |
| 603 | + * @param int $post_id The ID of the current post being edited. | |
| 604 | + */ | |
| 605 | + $config = apply_filters( 'elementor/editor/localize_settings', $config ); | |
| 606 | + | |
| 607 | + Utils::print_js_config( 'elementor-editor', 'ElementorConfig', $config ); | |
| 608 | + | |
| 609 | + wp_enqueue_script( 'elementor-editor' ); | |
| 610 | + | |
| 611 | + wp_set_script_translations( 'elementor-editor', 'elementor' ); | |
| 612 | + | |
| 613 | + $plugin->controls_manager->enqueue_control_scripts(); | |
| 614 | + | |
| 615 | + /** | |
| 422 | 616 | * After editor enqueue scripts. |
| 423 | 617 | * |
| 424 | 618 | * Fires after Elementor editor scripts are enqueued. |
| 425 | 619 | * |
| @@ -445,13 +639,84 @@ | ||
| 445 | 639 | * @since 1.0.0 |
| 446 | 640 | */ |
| 447 | 641 | do_action( 'elementor/editor/before_enqueue_styles' ); |
| 448 | 642 | |
| 449 | - $this->get_loader()->register_styles(); | |
| 450 | - $this->get_loader()->enqueue_styles(); | |
| 643 | + $suffix = Utils::is_script_debug() ? '' : '.min'; | |
| 451 | 644 | |
| 452 | - $this->enqueue_theme_ui_styles(); | |
| 645 | + $direction_suffix = is_rtl() ? '-rtl' : ''; | |
| 453 | 646 | |
| 647 | + wp_register_style( | |
| 648 | + 'font-awesome', | |
| 649 | + ELEMENTOR_ASSETS_URL . 'lib/font-awesome/css/font-awesome' . $suffix . '.css', | |
| 650 | + [], | |
| 651 | + '4.7.0' | |
| 652 | + ); | |
| 653 | + | |
| 654 | + wp_register_style( | |
| 655 | + 'elementor-select2', | |
| 656 | + ELEMENTOR_ASSETS_URL . 'lib/e-select2/css/e-select2' . $suffix . '.css', | |
| 657 | + [], | |
| 658 | + '4.0.6-rc.1' | |
| 659 | + ); | |
| 660 | + | |
| 661 | + wp_register_style( | |
| 662 | + 'google-font-roboto', | |
| 663 | + 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700', | |
| 664 | + [], | |
| 665 | + ELEMENTOR_VERSION | |
| 666 | + ); | |
| 667 | + | |
| 668 | + wp_register_style( | |
| 669 | + 'flatpickr', | |
| 670 | + ELEMENTOR_ASSETS_URL . 'lib/flatpickr/flatpickr' . $suffix . '.css', | |
| 671 | + [], | |
| 672 | + '1.12.0' | |
| 673 | + ); | |
| 674 | + | |
| 675 | + wp_register_style( | |
| 676 | + 'pickr', | |
| 677 | + ELEMENTOR_ASSETS_URL . 'lib/pickr/themes/monolith.min.css', | |
| 678 | + [], | |
| 679 | + '1.5.0' | |
| 680 | + ); | |
| 681 | + | |
| 682 | + wp_register_style( | |
| 683 | + 'elementor-editor', | |
| 684 | + ELEMENTOR_ASSETS_URL . 'css/editor' . $direction_suffix . $suffix . '.css', | |
| 685 | + [ | |
| 686 | + 'elementor-common', | |
| 687 | + 'elementor-select2', | |
| 688 | + 'elementor-icons', | |
| 689 | + 'wp-auth-check', | |
| 690 | + 'google-font-roboto', | |
| 691 | + 'flatpickr', | |
| 692 | + 'pickr', | |
| 693 | + ], | |
| 694 | + ELEMENTOR_VERSION | |
| 695 | + ); | |
| 696 | + | |
| 697 | + wp_enqueue_style( 'elementor-editor' ); | |
| 698 | + | |
| 699 | + $ui_theme = SettingsManager::get_settings_managers( 'editorPreferences' )->get_model()->get_settings( 'ui_theme' ); | |
| 700 | + | |
| 701 | + if ( 'light' !== $ui_theme ) { | |
| 702 | + $ui_theme_media_queries = 'all'; | |
| 703 | + | |
| 704 | + if ( 'auto' === $ui_theme ) { | |
| 705 | + $ui_theme_media_queries = '(prefers-color-scheme: dark)'; | |
| 706 | + } | |
| 707 | + | |
| 708 | + wp_enqueue_style( | |
| 709 | + 'elementor-editor-dark-mode', | |
| 710 | + ELEMENTOR_ASSETS_URL . 'css/editor-dark-mode' . $suffix . '.css', | |
| 711 | + [ | |
| 712 | + 'elementor-editor', | |
| 713 | + ], | |
| 714 | + ELEMENTOR_VERSION, | |
| 715 | + $ui_theme_media_queries | |
| 716 | + ); | |
| 717 | + } | |
| 718 | + | |
| 454 | 719 | $breakpoints = Plugin::$instance->breakpoints->get_breakpoints(); |
| 455 | 720 | |
| 456 | 721 | // The two breakpoints under 'tablet' need to be checked for values. |
| 457 | 722 | if ( $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE ]->is_custom() || $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE_EXTRA ]->is_enabled() ) { |
| @@ -470,44 +735,51 @@ | ||
| 470 | 735 | */ |
| 471 | 736 | do_action( 'elementor/editor/after_enqueue_styles' ); |
| 472 | 737 | } |
| 473 | 738 | |
| 474 | - private function enqueue_theme_ui_styles() { | |
| 475 | - $ui_theme_selected = SettingsManager::get_settings_managers( 'editorPreferences' )->get_model()->get_settings( 'ui_theme' ); | |
| 739 | + /** | |
| 740 | + * Get WordPress editor config. | |
| 741 | + * | |
| 742 | + * Config the default WordPress editor with custom settings for Elementor use. | |
| 743 | + * | |
| 744 | + * @since 1.9.0 | |
| 745 | + * @access private | |
| 746 | + */ | |
| 747 | + private function get_wp_editor_config() { | |
| 748 | + // Remove all TinyMCE plugins. | |
| 749 | + remove_all_filters( 'mce_buttons', 10 ); | |
| 750 | + remove_all_filters( 'mce_external_plugins', 10 ); | |
| 476 | 751 | |
| 477 | - $ui_themes = [ | |
| 478 | - 'light', | |
| 479 | - 'dark', | |
| 480 | - ]; | |
| 752 | + if ( ! class_exists( '\_WP_Editors', false ) ) { | |
| 753 | + require ABSPATH . WPINC . '/class-wp-editor.php'; | |
| 754 | + } | |
| 481 | 755 | |
| 482 | - if ( 'auto' === $ui_theme_selected || ! in_array( $ui_theme_selected, $ui_themes, true ) ) { | |
| 483 | - $ui_light_theme_media_queries = '(prefers-color-scheme: light)'; | |
| 484 | - $ui_dark_theme_media_queries = '(prefers-color-scheme: dark)'; | |
| 485 | - } else { | |
| 486 | - $ui_light_theme_media_queries = 'none'; | |
| 487 | - $ui_dark_theme_media_queries = 'none'; | |
| 756 | + // WordPress 4.8 and higher | |
| 757 | + if ( method_exists( '\_WP_Editors', 'print_tinymce_scripts' ) ) { | |
| 758 | + \_WP_Editors::print_default_editor_scripts(); | |
| 759 | + \_WP_Editors::print_tinymce_scripts(); | |
| 760 | + } | |
| 761 | + ob_start(); | |
| 488 | 762 | |
| 489 | - if ( 'light' === $ui_theme_selected ) { | |
| 490 | - $ui_light_theme_media_queries = 'all'; | |
| 491 | - } elseif ( 'dark' === $ui_theme_selected ) { | |
| 492 | - $ui_dark_theme_media_queries = 'all'; | |
| 493 | - } | |
| 494 | - } | |
| 763 | + wp_editor( | |
| 764 | + '%%EDITORCONTENT%%', | |
| 765 | + 'elementorwpeditor', | |
| 766 | + [ | |
| 767 | + 'editor_class' => 'elementor-wp-editor', | |
| 768 | + 'editor_height' => 250, | |
| 769 | + 'drag_drop_upload' => true, | |
| 770 | + ] | |
| 771 | + ); | |
| 495 | 772 | |
| 496 | - $this->enqueue_theme_ui( 'light', $ui_light_theme_media_queries ); | |
| 497 | - $this->enqueue_theme_ui( 'dark', $ui_dark_theme_media_queries ); | |
| 498 | - } | |
| 773 | + $config = ob_get_clean(); | |
| 499 | 774 | |
| 500 | - private function enqueue_theme_ui( $ui_theme, $ui_theme_media_queries = 'all' ) { | |
| 501 | - $suffix = Utils::is_script_debug() ? '' : '.min'; | |
| 775 | + // Don't call \_WP_Editors methods again | |
| 776 | + remove_action( 'admin_print_footer_scripts', [ '_WP_Editors', 'editor_js' ], 50 ); | |
| 777 | + remove_action( 'admin_print_footer_scripts', [ '_WP_Editors', 'print_default_editor_scripts' ], 45 ); | |
| 502 | 778 | |
| 503 | - wp_enqueue_style( | |
| 504 | - 'e-theme-ui-' . $ui_theme, | |
| 505 | - ELEMENTOR_ASSETS_URL . 'css/theme-' . $ui_theme . $suffix . '.css', | |
| 506 | - [], | |
| 507 | - ELEMENTOR_VERSION, | |
| 508 | - $ui_theme_media_queries | |
| 509 | - ); | |
| 779 | + \_WP_Editors::editor_js(); | |
| 780 | + | |
| 781 | + return $config; | |
| 510 | 782 | } |
| 511 | 783 | |
| 512 | 784 | /** |
| 513 | 785 | * Editor head trigger. |
| @@ -548,11 +820,13 @@ | ||
| 548 | 820 | $plugin->controls_manager->render_controls(); |
| 549 | 821 | $plugin->widgets_manager->render_widgets_content(); |
| 550 | 822 | $plugin->elements_manager->render_elements_content(); |
| 551 | 823 | |
| 824 | + $plugin->schemes_manager->print_schemes_templates(); | |
| 825 | + | |
| 552 | 826 | $plugin->dynamic_tags->print_templates(); |
| 553 | 827 | |
| 554 | - $this->get_loader()->register_additional_templates(); | |
| 828 | + $this->init_editor_templates(); | |
| 555 | 829 | |
| 556 | 830 | /** |
| 557 | 831 | * Elementor editor footer. |
| 558 | 832 | * |
| @@ -591,9 +865,8 @@ | ||
| 591 | 865 | public function __construct() { |
| 592 | 866 | Plugin::$instance->data_manager_v2->register_controller( new Data\Globals\Controller() ); |
| 593 | 867 | |
| 594 | 868 | $this->notice_bar = new Notice_Bar(); |
| 595 | - $this->promotion = new Promotion(); | |
| 596 | 869 | |
| 597 | 870 | add_action( 'admin_action_elementor', [ $this, 'init' ] ); |
| 598 | 871 | add_action( 'template_redirect', [ $this, 'redirect_to_new_url' ] ); |
| 599 | 872 | |
| @@ -599,89 +872,11 @@ | ||
| 599 | 872 | |
| 600 | 873 | // Handle autocomplete feature for URL control. |
| 601 | 874 | add_filter( 'wp_link_query_args', [ $this, 'filter_wp_link_query_args' ] ); |
| 602 | 875 | add_filter( 'wp_link_query', [ $this, 'filter_wp_link_query' ] ); |
| 603 | - | |
| 604 | - add_filter( 'replace_editor', [ $this, 'filter_replace_editor' ], 10, 2 ); | |
| 605 | 876 | } |
| 606 | 877 | |
| 607 | 878 | /** |
| 608 | - * Whether the Document-Isolation-Policy header should be sent on the | |
| 609 | - * Elementor editor screen and the editor preview iframe. | |
| 610 | - * | |
| 611 | - * DIP places the document in its own agent cluster, which is the prerequisite | |
| 612 | - * for cross-origin isolation features such as SharedArrayBuffer (required by | |
| 613 | - * WordPress core's client-side media processing introduced in WP 7.1). | |
| 614 | - * | |
| 615 | - * Both the editor parent document and the preview iframe must send the same | |
| 616 | - * DIP header so they join the same agent cluster and synchronous DOM access | |
| 617 | - * between them (e.g. `iframe.contentWindow.elementorFrontend`) keeps working. | |
| 618 | - * | |
| 619 | - * The header is only honored by browsers on a secure context (HTTPS or | |
| 620 | - * localhost) so the helper short-circuits on insecure origins to avoid | |
| 621 | - * sending a header that the browser will ignore. | |
| 622 | - * | |
| 623 | - * @since 4.1.0 | |
| 624 | - * | |
| 625 | - * @return bool | |
| 626 | - */ | |
| 627 | - public static function should_use_document_isolation_policy() { | |
| 628 | - if ( ! is_ssl() ) { | |
| 629 | - $raw_host = isset( $_SERVER['HTTP_HOST'] ) ? sanitize_text_field( wp_unslash( $_SERVER['HTTP_HOST'] ) ) : ''; | |
| 630 | - $host = strtolower( (string) strtok( $raw_host, ':' ) ); | |
| 631 | - | |
| 632 | - if ( 'localhost' !== $host && ! str_ends_with( $host, '.localhost' ) ) { | |
| 633 | - return false; | |
| 634 | - } | |
| 635 | - } | |
| 636 | - | |
| 637 | - /** | |
| 638 | - * Filters whether Elementor sends the Document-Isolation-Policy header | |
| 639 | - * on the editor screen and preview iframe. | |
| 640 | - * | |
| 641 | - * @since 4.1.0 | |
| 642 | - * | |
| 643 | - * @param bool $enabled Whether DIP is enabled. Defaults to true on a secure context. | |
| 644 | - */ | |
| 645 | - return (bool) apply_filters( 'elementor/editor/use_document_isolation_policy', true ); | |
| 646 | - } | |
| 647 | - | |
| 648 | - /** | |
| 649 | - * Send the Document-Isolation-Policy header for the current response. | |
| 650 | - * | |
| 651 | - * Safe to call from both the Elementor editor screen handler and the | |
| 652 | - * preview iframe handler. No-op when {@see self::should_use_document_isolation_policy()} | |
| 653 | - * returns false. | |
| 654 | - * | |
| 655 | - * @since 4.1.0 | |
| 656 | - */ | |
| 657 | - public static function send_document_isolation_policy_header() { | |
| 658 | - if ( ! self::should_use_document_isolation_policy() || headers_sent() ) { | |
| 659 | - return; | |
| 660 | - } | |
| 661 | - | |
| 662 | - header( 'Document-Isolation-Policy: isolate-and-credentialless' ); | |
| 663 | - } | |
| 664 | - | |
| 665 | - /** | |
| 666 | - * Signals to WordPress that Elementor is replacing the block editor on its own editor page, | |
| 667 | - * so that block-editor-specific behaviour (e.g. WP 7.0 COOP/COEP isolation headers) is not | |
| 668 | - * applied when the Elementor editor is active. | |
| 669 | - * | |
| 670 | - * @param bool $replace Whether the editor is being replaced. | |
| 671 | - * @param \WP_Post $post The post being edited. | |
| 672 | - * | |
| 673 | - * @return bool | |
| 674 | - */ | |
| 675 | - public function filter_replace_editor( $replace, $post ) { | |
| 676 | - if ( isset( $_REQUEST['action'] ) && 'elementor' === $_REQUEST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 677 | - return true; | |
| 678 | - } | |
| 679 | - | |
| 680 | - return $replace; | |
| 681 | - } | |
| 682 | - | |
| 683 | - /** | |
| 684 | 879 | * @since 2.2.0 |
| 685 | 880 | * @access public |
| 686 | 881 | */ |
| 687 | 882 | public function filter_wp_link_query_args( $query ) { |
| @@ -713,82 +908,57 @@ | ||
| 713 | 908 | |
| 714 | 909 | return $results; |
| 715 | 910 | } |
| 716 | 911 | |
| 717 | - public function set_post_id( $post_id ) { | |
| 718 | - $this->post_id = $post_id; | |
| 719 | - } | |
| 720 | - | |
| 721 | 912 | /** |
| 722 | - * Get loader. | |
| 913 | + * Init editor templates. | |
| 723 | 914 | * |
| 724 | - * @return Editor_Loader | |
| 915 | + * Initialize default elementor templates used in the editor panel. | |
| 916 | + * | |
| 917 | + * @since 1.7.0 | |
| 918 | + * @access private | |
| 725 | 919 | */ |
| 726 | - private function get_loader() { | |
| 727 | - if ( ! $this->loader ) { | |
| 728 | - $this->loader = new Editor_Loader( | |
| 729 | - new Collection( [ | |
| 730 | - 'assets_url' => ELEMENTOR_ASSETS_URL, | |
| 731 | - 'min_suffix' => ( Utils::is_script_debug() || Utils::is_elementor_tests() ) ? '' : '.min', | |
| 732 | - 'direction_suffix' => is_rtl() ? '-rtl' : '', | |
| 733 | - ] ), | |
| 734 | - ( new Assets_Config_Provider() )->set_path_resolver( | |
| 735 | - function ( $name ) { | |
| 736 | - return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php"; | |
| 737 | - } | |
| 738 | - ) | |
| 739 | - ); | |
| 920 | + private function init_editor_templates() { | |
| 921 | + $template_names = [ | |
| 922 | + 'global', | |
| 923 | + 'panel', | |
| 924 | + 'panel-elements', | |
| 925 | + 'repeater', | |
| 926 | + 'templates', | |
| 927 | + 'navigator', | |
| 928 | + 'hotkeys', | |
| 929 | + 'responsive-bar', | |
| 930 | + ]; | |
| 740 | 931 | |
| 741 | - $this->loader->init(); | |
| 932 | + foreach ( $template_names as $template_name ) { | |
| 933 | + Plugin::$instance->common->add_template( ELEMENTOR_PATH . "includes/editor-templates/$template_name.php" ); | |
| 742 | 934 | } |
| 743 | - | |
| 744 | - return $this->loader; | |
| 745 | 935 | } |
| 746 | 936 | |
| 747 | - /** | |
| 748 | - * Get elements presets. | |
| 749 | - * | |
| 750 | - * @return array | |
| 751 | - */ | |
| 752 | - public function get_elements_presets() { | |
| 753 | - $element_types = Plugin::$instance->elements_manager->get_element_types(); | |
| 754 | - $presets = []; | |
| 937 | + private function bc_move_document_filters() { | |
| 938 | + global $wp_filter; | |
| 755 | 939 | |
| 756 | - foreach ( $element_types as $el_type => $element ) { | |
| 757 | - $this->check_element_for_presets( $element, $el_type, $presets ); | |
| 758 | - } | |
| 940 | + $old_tag = 'elementor/editor/localize_settings'; | |
| 941 | + $new_tag = 'elementor/document/config'; | |
| 759 | 942 | |
| 760 | - return $presets; | |
| 761 | - } | |
| 762 | - | |
| 763 | - /** | |
| 764 | - * @return void | |
| 765 | - */ | |
| 766 | - private function check_element_for_presets( $element, $el_type, &$presets ) { | |
| 767 | - $element_presets = $element->get_panel_presets(); | |
| 768 | - | |
| 769 | - if ( empty( $element_presets ) ) { | |
| 943 | + if ( ! has_filter( $old_tag ) ) { | |
| 770 | 944 | return; |
| 771 | 945 | } |
| 772 | 946 | |
| 773 | - foreach ( $element_presets as $key => $preset ) { | |
| 774 | - $this->maybe_add_preset( $el_type, $preset, $key, $presets ); | |
| 775 | - } | |
| 776 | - } | |
| 947 | + foreach ( $wp_filter[ $old_tag ] as $priority => $filters ) { | |
| 948 | + foreach ( $filters as $filter_id => $filter_args ) { | |
| 949 | + if ( 2 === $filter_args['accepted_args'] ) { | |
| 950 | + remove_filter( $old_tag, $filter_id, $priority ); | |
| 777 | 951 | |
| 778 | - /** | |
| 779 | - * @return void | |
| 780 | - */ | |
| 781 | - private function maybe_add_preset( $el_type, $preset, $key, &$presets ) { | |
| 782 | - if ( $this->is_valid_preset( $el_type, $preset ) ) { | |
| 783 | - $presets[ $key ] = $preset; | |
| 952 | + add_filter( $new_tag, $filter_args['function'], $priority, 2 ); | |
| 953 | + | |
| 954 | + // TODO: Hard deprecation | |
| 955 | + // _deprecated_hook( '`' . $old_tag . ` is no longer using post_id', '2.9.0', $new_tag' ); | |
| 956 | + } | |
| 957 | + } | |
| 784 | 958 | } |
| 785 | 959 | } |
| 786 | 960 | |
| 787 | - /** | |
| 788 | - * @return boolean | |
| 789 | - */ | |
| 790 | - private function is_valid_preset( $el_type, $preset ) { | |
| 791 | - return isset( $preset['replacements']['custom']['originalWidget'] ) | |
| 792 | - && $el_type === $preset['replacements']['custom']['originalWidget']; | |
| 961 | + public function set_post_id( $post_id ) { | |
| 962 | + $this->post_id = $post_id; | |
| 793 | 963 | } |
| 794 | 964 | } |
