← All changes | core/editor/editor.php +250 -101 4.1.0-dev2 → 3.11.2 View file →

		@@ -1,15 +1,25 @@
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_Factory;
8		-use Elementor\Core\Editor\Loader\Editor_Loader_Interface;
	10	+use Elementor\Core\Editor\Config_Providers\Config_Provider_Factory;
	11	+use Elementor\Core\Experiments\Manager as Experiments_Manager;
	12	+use Elementor\Core\Files\Uploads_Manager;
	13	+use Elementor\Core\Schemes\Manager as Schemes_Manager;
9	14	use Elementor\Core\Settings\Manager as SettingsManager;
	15	+use Elementor\Icons_Manager;
10	16	use Elementor\Plugin;
	17	+use Elementor\Settings;
	18	+use Elementor\Shapes;
11	19	use Elementor\TemplateLibrary\Source_Local;
	20	+use Elementor\Tools;
	21	+use Elementor\User;
12	22	use Elementor\Utils;
13	23	use Elementor\Core\Editor\Data;
14	24
15	25	if ( ! defined( 'ABSPATH' ) ) {
		@@ -30,8 +40,10 @@
30	40	* User capability required to access Elementor editor.
31	41	*/
32	42	const EDITING_CAPABILITY = 'edit_posts';
33	43
	44	+ const EDITOR_V2_EXPERIMENT_NAME = 'editor_v2';
	45	+
34	46	/**
35	47	* Post ID.
36	48	*
37	49	* Holds the ID of the current post being edited.
		@@ -65,9 +77,9 @@
65	77	*/
66	78	public $promotion;
67	79
68	80	/**
69		- * @var Editor_Loader_Interface
	81	+ * @var Editor_Loader
70	82	*/
71	83	private $loader;
72	84
73	85	/**
		@@ -80,11 +92,11 @@
80	92	*
81	93	* @since 1.0.0
82	94	* @access public
83	95	*
84		- * @param bool $to_die Optional. Whether to die at the end. Default is `true`.
	96	+ * @param bool $die Optional. Whether to die at the end. Default is `true`.
85	97	*/
86		- public function init( $to_die = true ) {
	98	+ public function init( $die = true ) {
87	99	if ( empty( $_REQUEST['post'] ) ) {
88	100	return;
89	101	}
90	102
		@@ -159,9 +171,9 @@
159	171
160	172	$this->get_loader()->print_root_template();
161	173
162	174	// From the action it's an empty string, from tests its `false`
163		- if ( false !== $to_die ) {
	175	+ if ( false !== $die ) {
164	176	die;
165	177	}
166	178	}
167	179
		@@ -333,12 +345,16 @@
333	345	remove_action( 'wp_enqueue_scripts', [ $this, __FUNCTION__ ], 999999 );
334	346
335	347	global $wp_styles, $wp_scripts;
336	348
	349	+ $plugin = Plugin::$instance;
	350	+
337	351	// Reset global variable
338	352	$wp_styles = new \WP_Styles(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
339	353	$wp_scripts = new \WP_Scripts(); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
340	354
	355	+ $suffix = ( Utils::is_script_debug() || Utils::is_elementor_tests() ) ? '' : '.min';
	356	+
341	357	$this->get_loader()->register_scripts();
342	358
343	359	/**
344	360	* Before editor enqueue scripts.
		@@ -351,11 +367,116 @@
351	367
352	368	// Tweak for WP Admin menu icons
353	369	wp_print_styles( 'editor-buttons' );
354	370
	371	+ $settings = SettingsManager::get_settings_managers_config();
	372	+ // Moved to document since 2.9.0.
	373	+ unset( $settings['page'] );
	374	+
	375	+ $document = Plugin::$instance->documents->get_doc_or_auto_save( $this->post_id );
	376	+ $kits_manager = Plugin::$instance->kits_manager;
	377	+
	378	+ $page_title_selector = $kits_manager->get_current_settings( 'page_title_selector' );
	379	+
	380	+ $page_title_selector .= ', .elementor-page-title .elementor-heading-title';
	381	+
	382	+ $config = [
	383	+ 'initial_document' => $document->get_config(),
	384	+ 'version' => ELEMENTOR_VERSION,
	385	+ 'home_url' => home_url(),
	386	+ 'admin_settings_url' => admin_url( 'admin.php?page=' . Settings::PAGE_ID ),
	387	+ 'admin_tools_url' => admin_url( 'admin.php?page=' . Tools::PAGE_ID ),
	388	+ 'autosave_interval' => AUTOSAVE_INTERVAL,
	389	+ 'tabs' => $plugin->controls_manager->get_tabs(),
	390	+ 'controls' => $plugin->controls_manager->get_controls_data(),
	391	+ 'elements' => $plugin->elements_manager->get_element_types_config(),
	392	+ 'schemes' => [
	393	+ 'items' => $plugin->schemes_manager->get_registered_schemes_data(),
	394	+ 'enabled_schemes' => Schemes_Manager::get_enabled_schemes(),
	395	+ ],
	396	+ 'globals' => [
	397	+ 'defaults_enabled' => [
	398	+ 'colors' => $kits_manager->is_custom_colors_enabled(),
	399	+ 'typography' => $kits_manager->is_custom_typography_enabled(),
	400	+ ],
	401	+ ],
	402	+ 'icons' => [
	403	+ 'libraries' => Icons_Manager::get_icon_manager_tabs_config(),
	404	+ 'goProURL' => 'https://go.elementor.com/go-pro-icon-library/',
	405	+ ],
	406	+ 'fa4_to_fa5_mapping_url' => ELEMENTOR_ASSETS_URL . 'lib/font-awesome/migration/mapping.js',
	407	+ 'default_schemes' => $plugin->schemes_manager->get_schemes_defaults(),
	408	+ 'settings' => $settings,
	409	+ 'system_schemes' => $plugin->schemes_manager->get_system_schemes(),
	410	+ 'wp_editor' => $this->get_wp_editor_config(),
	411	+ 'settings_page_link' => Settings::get_url(),
	412	+ 'tools_page_link' => Tools::get_url(),
	413	+ 'tools_page_nonce' => wp_create_nonce( 'tools-page-from-editor' ),
	414	+ 'elementor_site' => 'https://go.elementor.com/about-elementor/',
	415	+ 'docs_elementor_site' => 'https://go.elementor.com/docs/',
	416	+ 'help_the_content_url' => 'https://go.elementor.com/the-content-missing/',
	417	+ 'help_flexbox_bc_url' => 'https://go.elementor.com/flexbox-layout-bc/',
	418	+ 'elementPromotionURL' => 'https://go.elementor.com/go-pro-%s',
	419	+ 'dynamicPromotionURL' => 'https://go.elementor.com/go-pro-dynamic-tag',
	420	+ 'additional_shapes' => Shapes::get_additional_shapes_for_config(),
	421	+ 'user' => [
	422	+ 'restrictions' => $plugin->role_manager->get_user_restrictions_array(),
	423	+ 'is_administrator' => current_user_can( 'manage_options' ),
	424	+ 'introduction' => User::get_introduction_meta(),
	425	+ 'locale' => get_user_locale(),
	426	+ ],
	427	+ 'preview' => [
	428	+ 'help_preview_error_url' => 'https://go.elementor.com/preview-not-loaded/',
	429	+ 'help_preview_http_error_url' => 'https://go.elementor.com/preview-not-loaded/#permissions',
	430	+ 'help_preview_http_error_500_url' => 'https://go.elementor.com/500-error/',
	431	+ 'debug_data' => Loading_Inspection_Manager::instance()->run_inspections(),
	432	+ ],
	433	+ 'locale' => get_locale(),
	434	+ 'rich_editing_enabled' => filter_var( get_user_meta( get_current_user_id(), 'rich_editing', true ), FILTER_VALIDATE_BOOLEAN ),
	435	+ 'page_title_selector' => $page_title_selector,
	436	+ 'tinymceHasCustomConfig' => class_exists( 'Tinymce_Advanced' ) || class_exists( 'Advanced_Editor_Tools' ),
	437	+ 'inlineEditing' => Plugin::$instance->widgets_manager->get_inline_editing_config(),
	438	+ 'dynamicTags' => Plugin::$instance->dynamic_tags->get_config(),
	439	+ 'ui' => [
	440	+ 'darkModeStylesheetURL' => ELEMENTOR_ASSETS_URL . 'css/editor-dark-mode' . $suffix . '.css',
	441	+ 'defaultGenericFonts' => $kits_manager->get_current_settings( 'default_generic_fonts' ),
	442	+ ],
	443	+ // Empty array for BC to avoid errors.
	444	+ 'i18n' => [],
	445	+ // 'responsive' contains the custom breakpoints config introduced in Elementor v3.2.0
	446	+ 'responsive' => [
	447	+ 'breakpoints' => Plugin::$instance->breakpoints->get_breakpoints_config(),
	448	+ 'icons_map' => Plugin::$instance->breakpoints->get_responsive_icons_classes_map(),
	449	+ ],
	450	+ 'promotion' => [
	451	+ 'elements' => $this->promotion->get_elements_promotion(),
	452	+ ],
	453	+ ];
	454	+
	455	+ if ( ! Utils::has_pro() && current_user_can( 'manage_options' ) ) {
	456	+ $config['promotionWidgets'] = Api::get_promotion_widgets();
	457	+ }
	458	+
	459	+ $this->bc_move_document_filters();
	460	+
	461	+ /**
	462	+ * Localize editor settings.
	463	+ *
	464	+ * Filters the editor localized settings.
	465	+ *
	466	+ * @since 1.0.0
	467	+ *
	468	+ * @param array $config Editor configuration.
	469	+ * @param int $post_id The ID of the current post being edited.
	470	+ */
	471	+ $config = apply_filters( 'elementor/editor/localize_settings', $config );
	472	+
	473	+ Utils::print_js_config( 'elementor-editor', 'ElementorConfig', $config );
	474	+
355	475	$this->get_loader()->enqueue_scripts();
	476	+ $this->get_loader()->load_scripts_translations();
356	477
357		- Plugin::$instance->controls_manager->enqueue_control_scripts();
	478	+ $plugin->controls_manager->enqueue_control_scripts();
358	479
359	480	/**
360	481	* After editor enqueue scripts.
361	482	*
		@@ -383,13 +504,33 @@
383	504	* @since 1.0.0
384	505	*/
385	506	do_action( 'elementor/editor/before_enqueue_styles' );
386	507
	508	+ $suffix = Utils::is_script_debug() ? '' : '.min';
	509	+
387	510	$this->get_loader()->register_styles();
388	511	$this->get_loader()->enqueue_styles();
389	512
390		- $this->enqueue_theme_ui_styles();
	513	+ $ui_theme = SettingsManager::get_settings_managers( 'editorPreferences' )->get_model()->get_settings( 'ui_theme' );
391	514
	515	+ if ( 'light' !== $ui_theme ) {
	516	+ $ui_theme_media_queries = 'all';
	517	+
	518	+ if ( 'auto' === $ui_theme ) {
	519	+ $ui_theme_media_queries = '(prefers-color-scheme: dark)';
	520	+ }
	521	+
	522	+ wp_enqueue_style(
	523	+ 'elementor-editor-dark-mode',
	524	+ ELEMENTOR_ASSETS_URL . 'css/editor-dark-mode' . $suffix . '.css',
	525	+ [
	526	+ 'elementor-editor',
	527	+ ],
	528	+ ELEMENTOR_VERSION,
	529	+ $ui_theme_media_queries
	530	+ );
	531	+ }
	532	+
392	533	$breakpoints = Plugin::$instance->breakpoints->get_breakpoints();
393	534
394	535	// The two breakpoints under 'tablet' need to be checked for values.
395	536	if ( $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE ]->is_custom() || $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE_EXTRA ]->is_enabled() ) {
		@@ -408,44 +549,51 @@
408	549	*/
409	550	do_action( 'elementor/editor/after_enqueue_styles' );
410	551	}
411	552
412		- private function enqueue_theme_ui_styles() {
413		- $ui_theme_selected = SettingsManager::get_settings_managers( 'editorPreferences' )->get_model()->get_settings( 'ui_theme' );
	553	+ /**
	554	+ * Get WordPress editor config.
	555	+ *
	556	+ * Config the default WordPress editor with custom settings for Elementor use.
	557	+ *
	558	+ * @since 1.9.0
	559	+ * @access private
	560	+ */
	561	+ private function get_wp_editor_config() {
	562	+ // Remove all TinyMCE plugins.
	563	+ remove_all_filters( 'mce_buttons', 10 );
	564	+ remove_all_filters( 'mce_external_plugins', 10 );
414	565
415		- $ui_themes = [
416		- 'light',
417		- 'dark',
418		- ];
	566	+ if ( ! class_exists( '\_WP_Editors', false ) ) {
	567	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	568	+ }
419	569
420		- if ( 'auto' === $ui_theme_selected || ! in_array( $ui_theme_selected, $ui_themes, true ) ) {
421		- $ui_light_theme_media_queries = '(prefers-color-scheme: light)';
422		- $ui_dark_theme_media_queries = '(prefers-color-scheme: dark)';
423		- } else {
424		- $ui_light_theme_media_queries = 'none';
425		- $ui_dark_theme_media_queries = 'none';
	570	+ // WordPress 4.8 and higher
	571	+ if ( method_exists( '\_WP_Editors', 'print_tinymce_scripts' ) ) {
	572	+ \_WP_Editors::print_default_editor_scripts();
	573	+ \_WP_Editors::print_tinymce_scripts();
	574	+ }
	575	+ ob_start();
426	576
427		- if ( 'light' === $ui_theme_selected ) {
428		- $ui_light_theme_media_queries = 'all';
429		- } elseif ( 'dark' === $ui_theme_selected ) {
430		- $ui_dark_theme_media_queries = 'all';
431		- }
432		- }
	577	+ wp_editor(
	578	+ '%%EDITORCONTENT%%',
	579	+ 'elementorwpeditor',
	580	+ [
	581	+ 'editor_class' => 'elementor-wp-editor',
	582	+ 'editor_height' => 250,
	583	+ 'drag_drop_upload' => true,
	584	+ ]
	585	+ );
433	586
434		- $this->enqueue_theme_ui( 'light', $ui_light_theme_media_queries );
435		- $this->enqueue_theme_ui( 'dark', $ui_dark_theme_media_queries );
436		- }
	587	+ $config = ob_get_clean();
437	588
438		- private function enqueue_theme_ui( $ui_theme, $ui_theme_media_queries = 'all' ) {
439		- $suffix = Utils::is_script_debug() ? '' : '.min';
	589	+ // Don't call \_WP_Editors methods again
	590	+ remove_action( 'admin_print_footer_scripts', [ '_WP_Editors', 'editor_js' ], 50 );
	591	+ remove_action( 'admin_print_footer_scripts', [ '_WP_Editors', 'print_default_editor_scripts' ], 45 );
440	592
441		- wp_enqueue_style(
442		- 'e-theme-ui-' . $ui_theme,
443		- ELEMENTOR_ASSETS_URL . 'css/theme-' . $ui_theme . $suffix . '.css',
444		- [],
445		- ELEMENTOR_VERSION,
446		- $ui_theme_media_queries
447		- );
	593	+ \_WP_Editors::editor_js();
	594	+
	595	+ return $config;
448	596	}
449	597
450	598	/**
451	599	* Editor head trigger.
		@@ -486,11 +634,13 @@
486	634	$plugin->controls_manager->render_controls();
487	635	$plugin->widgets_manager->render_widgets_content();
488	636	$plugin->elements_manager->render_elements_content();
489	637
	638	+ $plugin->schemes_manager->print_schemes_templates();
	639	+
490	640	$plugin->dynamic_tags->print_templates();
491	641
492		- $this->get_loader()->register_additional_templates();
	642	+ $this->init_editor_templates();
493	643
494	644	/**
495	645	* Elementor editor footer.
496	646	*
		@@ -534,34 +684,16 @@
534	684
535	685	add_action( 'admin_action_elementor', [ $this, 'init' ] );
536	686	add_action( 'template_redirect', [ $this, 'redirect_to_new_url' ] );
537	687
	688	+ $this->register_editor_v2_experiment();
	689	+
538	690	// Handle autocomplete feature for URL control.
539	691	add_filter( 'wp_link_query_args', [ $this, 'filter_wp_link_query_args' ] );
540	692	add_filter( 'wp_link_query', [ $this, 'filter_wp_link_query' ] );
541		-
542		- add_filter( 'replace_editor', [ $this, 'filter_replace_editor' ], 10, 2 );
543	693	}
544	694
545	695	/**
546		- * Signals to WordPress that Elementor is replacing the block editor on its own editor page,
547		- * so that block-editor-specific behaviour (e.g. WP 7.0 COOP/COEP isolation headers) is not
548		- * applied when the Elementor editor is active.
549		- *
550		- * @param bool $replace Whether the editor is being replaced.
551		- * @param \WP_Post $post The post being edited.
552		- *
553		- * @return bool
554		- */
555		- public function filter_replace_editor( $replace, $post ) {
556		- if ( isset( $_REQUEST['action'] ) && 'elementor' === $_REQUEST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
557		- return true;
558		- }
559		-
560		- return $replace;
561		- }
562		-
563		- /**
564	696	* @since 2.2.0
565	697	* @access public
566	698	*/
567	699	public function filter_wp_link_query_args( $query ) {
		@@ -593,71 +725,88 @@
593	725
594	726	return $results;
595	727	}
596	728
597		- public function set_post_id( $post_id ) {
598		- $this->post_id = $post_id;
599		- }
600		-
601	729	/**
602		- * Get loader.
	730	+ * Init editor templates.
603	731	*
604		- * @return Editor_Loader_Interface
	732	+ * Initialize default elementor templates used in the editor panel.
	733	+ *
	734	+ * @since 1.7.0
	735	+ * @access private
605	736	*/
606		- private function get_loader() {
607		- if ( ! $this->loader ) {
608		- $this->loader = Editor_Loader_Factory::create();
	737	+ private function init_editor_templates() {
	738	+ $template_names = [
	739	+ 'global',
	740	+ 'panel',
	741	+ 'panel-elements',
	742	+ 'repeater',
	743	+ 'templates',
	744	+ 'navigator',
	745	+ 'hotkeys',
	746	+ 'responsive-bar',
	747	+ ];
609	748
610		- $this->loader->init();
	749	+ foreach ( $template_names as $template_name ) {
	750	+ Plugin::$instance->common->add_template( ELEMENTOR_PATH . "includes/editor-templates/$template_name.php" );
611	751	}
	752	+ }
612	753
613		- return $this->loader;
614		- }
	754	+ private function bc_move_document_filters() {
	755	+ global $wp_filter;
615	756
616		- /**
617		- * Get elements presets.
618		- *
619		- * @return array
620		- */
621		- public function get_elements_presets() {
622		- $element_types = Plugin::$instance->elements_manager->get_element_types();
623		- $presets = [];
	757	+ $old_tag = 'elementor/editor/localize_settings';
	758	+ $new_tag = 'elementor/document/config';
624	759
625		- foreach ( $element_types as $el_type => $element ) {
626		- $this->check_element_for_presets( $element, $el_type, $presets );
	760	+ if ( ! has_filter( $old_tag ) ) {
	761	+ return;
627	762	}
628	763
629		- return $presets;
630		- }
	764	+ foreach ( $wp_filter[ $old_tag ] as $priority => $filters ) {
	765	+ foreach ( $filters as $filter_id => $filter_args ) {
	766	+ if ( 2 === $filter_args['accepted_args'] ) {
	767	+ remove_filter( $old_tag, $filter_id, $priority );
631	768
632		- /**
633		- * @return void
634		- */
635		- private function check_element_for_presets( $element, $el_type, &$presets ) {
636		- $element_presets = $element->get_panel_presets();
	769	+ add_filter( $new_tag, $filter_args['function'], $priority, 2 );
637	770
638		- if ( empty( $element_presets ) ) {
639		- return;
	771	+ // TODO: Hard deprecation
	772	+ // _deprecated_hook( '`' . $old_tag . ` is no longer using post_id', '2.9.0', $new_tag' );
	773	+ }
	774	+ }
640	775	}
	776	+ }
641	777
642		- foreach ( $element_presets as $key => $preset ) {
643		- $this->maybe_add_preset( $el_type, $preset, $key, $presets );
644		- }
	778	+ public function set_post_id( $post_id ) {
	779	+ $this->post_id = $post_id;
645	780	}
646	781
647	782	/**
648		- * @return void
	783	+ * Get loader.
	784	+ *
	785	+ * @return Editor_Loader
649	786	*/
650		- private function maybe_add_preset( $el_type, $preset, $key, &$presets ) {
651		- if ( $this->is_valid_preset( $el_type, $preset ) ) {
652		- $presets[ $key ] = $preset;
	787	+ private function get_loader() {
	788	+ if ( ! $this->loader ) {
	789	+ $this->loader = new Editor_Loader( Config_Provider_Factory::create() );
	790	+ $this->loader->register_hooks();
653	791	}
	792	+
	793	+ return $this->loader;
654	794	}
655	795
656	796	/**
657		- * @return boolean
	797	+ * Adding Editor V2 experiment.
	798	+ *
	799	+ * @return void
	800	+ * @throws \Exception
658	801	*/
659		- private function is_valid_preset( $el_type, $preset ) {
660		- return isset( $preset['replacements']['custom']['originalWidget'] )
661		- && $el_type === $preset['replacements']['custom']['originalWidget'];
	802	+ private function register_editor_v2_experiment() {
	803	+ Plugin::$instance->experiments->add_feature( [
	804	+ 'name' => static::EDITOR_V2_EXPERIMENT_NAME,
	805	+ 'title' => esc_html__( 'Editor V2', 'elementor' ),
	806	+ 'description' => esc_html__( 'Enable the new editor.', 'elementor' ),
	807	+ 'hidden' => true,
	808	+ 'default' => Experiments_Manager::STATE_INACTIVE,
	809	+ 'status' => Experiments_Manager::RELEASE_STATUS_ALPHA,
	810	+ ] );
662	811	}
663	812	}