← All changes | app/app.php +28 -95 4.1.0-dev2 → 3.11.2 View file →

		@@ -2,30 +2,16 @@
2	2	namespace Elementor\App;
3	3
4	4	use Elementor\App\AdminMenuItems\Theme_Builder_Menu_Item;
5	5	use Elementor\Core\Admin\Menu\Admin_Menu_Manager;
6		-use Elementor\Core\Experiments\Manager as ExperimentsManager;
	6	+use Elementor\Icons_Manager;
7	7	use Elementor\Modules\WebCli\Module as WebCLIModule;
8	8	use Elementor\Core\Base\App as BaseApp;
9	9	use Elementor\Core\Settings\Manager as SettingsManager;
10	10	use Elementor\Plugin;
11	11	use Elementor\TemplateLibrary\Source_Local;
12		-use Elementor\User;
13	12	use Elementor\Utils;
14		-use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager;
15		-use Elementor\Core\Utils\Assets_Config_Provider;
16		-use Elementor\Core\Utils\Collection;
17		-use Elementor\Core\Utils\Assets_Translation_Loader;
18		-use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
19		-use Elementor\App\AdminMenuItems\Editor_One_Theme_Builder_Menu;
20	13
21		-use Elementor\App\Modules\ImportExport\Module as ImportExportModule;
22		-use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule;
23		-use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule;
24		-use Elementor\App\Modules\SiteEditor\Module as SiteEditorModule;
25		-use Elementor\App\Modules\Onboarding\Module as OnboardingModule;
26		-use Elementor\App\Modules\SiteBuilder\Module as SiteBuilderModule;
27		-
28	14	if ( ! defined( 'ABSPATH' ) ) {
29	15	exit; // Exit if accessed directly.
30	16	}
31	17
		@@ -50,10 +36,10 @@
50	36	public function get_base_url() {
51	37	return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION );
52	38	}
53	39
54		- private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) {
55		- $menu_data_provider->register_menu( new Editor_One_Theme_Builder_Menu() );
	40	+ private function register_admin_menu( Admin_Menu_Manager $admin_menu ) {
	41	+ $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() );
56	42	}
57	43
58	44	public function fix_submenu( $menu ) {
59	45	global $submenu;
		@@ -84,19 +70,10 @@
84	70
85	71	public function admin_init() {
86	72	do_action( 'elementor/app/init', $this );
87	73
88		- // Add the introduction and user settings only when it is needed (when loading the app and not in the editor or admin pages)
89		- $this->set_settings( 'user', [
90		- 'introduction' => (object) User::get_introduction_meta(),
91		- 'is_administrator' => current_user_can( 'manage_options' ),
92		- 'restrictions' => Plugin::$instance->role_manager->get_user_restrictions_array(),
93		- ] );
94		-
95	74	$this->enqueue_assets();
96	75
97		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
98		-
99	76	// Setup default heartbeat options
100	77	// TODO: Enable heartbeat.
101	78	add_filter( 'heartbeat_settings', function( $settings ) {
102	79	$settings['interval'] = 15;
		@@ -112,20 +89,13 @@
112	89
113	90	return [
114	91	'menu_url' => $this->get_base_url() . '#site-editor/promotion',
115	92	'assets_url' => ELEMENTOR_ASSETS_URL,
116		- 'pages_url' => admin_url( 'edit.php?post_type=page' ),
117	93	'return_url' => $referer ? $referer : admin_url(),
118	94	'hasPro' => Utils::has_pro(),
119	95	'admin_url' => admin_url(),
120	96	'login_url' => wp_login_url(),
121	97	'base_url' => $this->get_base_url(),
122		- 'home_url' => home_url(),
123		- 'promotion' => Filtered_Promotions_Manager::get_filtered_promotion_data(
124		- [ 'upgrade_url' => 'https://go.elementor.com/go-pro-theme-builder/' ],
125		- 'elementor/site-editor/promotion',
126		- 'upgrade_url'
127		- ),
128	98	];
129	99	}
130	100
131	101	private function render() {
		@@ -132,16 +102,16 @@
132	102	require __DIR__ . '/view.php';
133	103	}
134	104
135	105	/**
136		- * Get Elementor editor theme color preference.
	106	+ * Get Elementor UI theme preference.
137	107	*
138		- * Retrieve the user theme color preference as defined by editor preferences manager.
	108	+ * Retrieve the user UI theme preference as defined by editor preferences manager.
139	109	*
140	110	* @since 3.0.0
141	111	* @access private
142	112	*
143		- * @return string Preferred editor theme.
	113	+ * @return string Preferred UI theme.
144	114	*/
145	115	private function get_elementor_ui_theme_preference() {
146	116	$editor_preferences = SettingsManager::get_settings_managers( 'editorPreferences' );
147	117
		@@ -163,38 +133,11 @@
163	133	{ document.body.classList.add( `eps-theme-dark` ); }' );
164	134	}
165	135	}
166	136
167		- private function register_packages() {
168		- $assets_config_provider = ( new Assets_Config_Provider() )
169		- ->set_path_resolver( function ( $name ) {
170		- return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php";
171		- } );
172		-
173		- Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding', 'site-builder' ] )
174		- ->each( function( $package ) use ( $assets_config_provider ) {
175		- $suffix = Utils::is_script_debug() ? '' : '.min';
176		- $config = $assets_config_provider->load( $package )->get( $package );
177		-
178		- if ( ! $config ) {
179		- return;
180		- }
181		-
182		- wp_register_script(
183		- $config['handle'],
184		- ELEMENTOR_ASSETS_URL . "js/packages/{$package}/{$package}{$suffix}.js",
185		- $config['deps'],
186		- ELEMENTOR_VERSION,
187		- true
188		- );
189		- } );
190		- }
191		-
192	137	private function enqueue_assets() {
193	138	Plugin::$instance->init_common();
194	139
195		- $this->register_packages();
196		-
197	140	/** @var WebCLIModule $web_cli */
198	141	$web_cli = Plugin::$instance->modules_manager->get_modules( 'web-cli' );
199	142	$web_cli->register_scripts();
200	143
		@@ -206,11 +149,23 @@
206	149	[],
207	150	'4.0.6-rc.1'
208	151	);
209	152
210		- Plugin::$instance->common->register_styles();
	153	+ wp_register_style(
	154	+ 'elementor-icons',
	155	+ $this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
	156	+ [],
	157	+ Icons_Manager::ELEMENTOR_ICONS_VERSION
	158	+ );
211	159
212	160	wp_register_style(
	161	+ 'elementor-common',
	162	+ $this->get_css_assets_url( 'common', null, 'default', true ),
	163	+ [],
	164	+ ELEMENTOR_VERSION
	165	+ );
	166	+
	167	+ wp_register_style(
213	168	'select2',
214	169	ELEMENTOR_ASSETS_URL . 'lib/e-select2/css/e-select2.css',
215	170	[],
216	171	'4.0.6-rc.1'
		@@ -254,12 +209,8 @@
254	209	$this->get_js_assets_url( 'app' ),
255	210	[
256	211	'wp-url',
257	212	'wp-i18n',
258		- 'elementor-v2-ui',
259		- 'elementor-v2-icons',
260		- 'elementor-v2-onboarding',
261		- 'elementor-v2-site-builder',
262	213	'react',
263	214	'react-dom',
264	215	'select2',
265	216	],
		@@ -268,9 +219,10 @@
268	219	);
269	220
270	221	$this->enqueue_dark_theme_detection_script();
271	222
272		- Assets_Translation_Loader::for_handles( [ 'elementor-app-packages', 'elementor-app' ], 'elementor' );
	223	+ wp_set_script_translations( 'elementor-app-packages', 'elementor' );
	224	+ wp_set_script_translations( 'elementor-app', 'elementor' );
273	225
274	226	$this->print_config();
275	227	}
276	228
		@@ -287,42 +239,23 @@
287	239
288	240	$this->print_config( 'elementor-app-loader' );
289	241	}
290	242
291		- private function register_import_export_customization_experiment() {
292		- Plugin::$instance->experiments->add_feature( [
293		- 'name' => 'import-export-customization',
294		- 'title' => esc_html__( 'Import/Export Customization', 'elementor' ),
295		- 'description' => esc_html__( 'Enhanced import/export for website templates. Selectively include site content, templates, and settings with advanced granular control.', 'elementor' ),
296		- 'release_status' => ExperimentsManager::RELEASE_STATUS_BETA,
297		- 'default' => ExperimentsManager::STATE_ACTIVE,
298		- 'hidden' => true,
299		- 'mutable' => false,
300		- ] );
301		- }
302		-
303	243	public function __construct() {
304		- $this->register_import_export_customization_experiment();
	244	+ $this->add_component( 'site-editor', new Modules\SiteEditor\Module() );
305	245
306		- $this->add_component( 'site-editor', new SiteEditorModule() );
307		- $this->add_component( 'site-builder', new SiteBuilderModule() );
308		-
309	246	if ( current_user_can( 'manage_options' ) || Utils::is_wp_cli() ) {
310		- $this->add_component( 'import-export', new ImportExportModule() );
	247	+ $this->add_component( 'import-export', new Modules\ImportExport\Module() );
311	248
312		- if ( Plugin::$instance->experiments->is_feature_active( 'import-export-customization' ) ) {
313		- $this->add_component( 'import-export-customization', new ImportExportCustomizationModule() );
314		- }
315		-
316	249	// Kit library is depended on import-export
317		- $this->add_component( 'kit-library', new KitLibraryModule() );
	250	+ $this->add_component( 'kit-library', new Modules\KitLibrary\Module() );
318	251	}
319	252
320		- $this->add_component( 'onboarding', new OnboardingModule() );
	253	+ $this->add_component( 'onboarding', new Modules\Onboarding\Module() );
321	254
322		- add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
323		- $this->register_editor_one_menu( $menu_data_provider );
324		- } );
	255	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	256	+ $this->register_admin_menu( $admin_menu );
	257	+ }, Source_Local::ADMIN_MENU_PRIORITY + 10 );
325	258
326	259	// Happens after WP plugin page validation.
327	260	add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] );
328	261