← All changes | app/app.php +14 -79 4.2.2 → 3.21.4 View file →

		@@ -2,9 +2,8 @@
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;
7	6	use Elementor\Modules\WebCli\Module as WebCLIModule;
8	7	use Elementor\Core\Base\App as BaseApp;
9	8	use Elementor\Core\Settings\Manager as SettingsManager;
10	9	use Elementor\Plugin;
		@@ -11,21 +10,9 @@
11	10	use Elementor\TemplateLibrary\Source_Local;
12	11	use Elementor\User;
13	12	use Elementor\Utils;
14	13	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	14
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	15	if ( ! defined( 'ABSPATH' ) ) {
29	16	exit; // Exit if accessed directly.
30	17	}
31	18
		@@ -50,10 +37,10 @@
50	37	public function get_base_url() {
51	38	return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION );
52	39	}
53	40
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() );
	41	+ private function register_admin_menu( Admin_Menu_Manager $admin_menu ) {
	42	+ $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() );
56	43	}
57	44
58	45	public function fix_submenu( $menu ) {
59	46	global $submenu;
		@@ -93,10 +80,8 @@
93	80	] );
94	81
95	82	$this->enqueue_assets();
96	83
97		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
98		-
99	84	// Setup default heartbeat options
100	85	// TODO: Enable heartbeat.
101	86	add_filter( 'heartbeat_settings', function( $settings ) {
102	87	$settings['interval'] = 15;
		@@ -118,9 +103,8 @@
118	103	'hasPro' => Utils::has_pro(),
119	104	'admin_url' => admin_url(),
120	105	'login_url' => wp_login_url(),
121	106	'base_url' => $this->get_base_url(),
122		- 'home_url' => home_url(),
123	107	'promotion' => Filtered_Promotions_Manager::get_filtered_promotion_data(
124	108	[ 'upgrade_url' => 'https://go.elementor.com/go-pro-theme-builder/' ],
125	109	'elementor/site-editor/promotion',
126	110	'upgrade_url'
		@@ -132,16 +116,16 @@
132	116	require __DIR__ . '/view.php';
133	117	}
134	118
135	119	/**
136		- * Get Elementor editor theme color preference.
	120	+ * Get Elementor UI theme preference.
137	121	*
138		- * Retrieve the user theme color preference as defined by editor preferences manager.
	122	+ * Retrieve the user UI theme preference as defined by editor preferences manager.
139	123	*
140	124	* @since 3.0.0
141	125	* @access private
142	126	*
143		- * @return string Preferred editor theme.
	127	+ * @return string Preferred UI theme.
144	128	*/
145	129	private function get_elementor_ui_theme_preference() {
146	130	$editor_preferences = SettingsManager::get_settings_managers( 'editorPreferences' );
147	131
		@@ -163,38 +147,11 @@
163	147	{ document.body.classList.add( `eps-theme-dark` ); }' );
164	148	}
165	149	}
166	150
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', 'schema', '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	151	private function enqueue_assets() {
193	152	Plugin::$instance->init_common();
194	153
195		- $this->register_packages();
196		-
197	154	/** @var WebCLIModule $web_cli */
198	155	$web_cli = Plugin::$instance->modules_manager->get_modules( 'web-cli' );
199	156	$web_cli->register_scripts();
200	157
		@@ -254,12 +211,8 @@
254	211	$this->get_js_assets_url( 'app' ),
255	212	[
256	213	'wp-url',
257	214	'wp-i18n',
258		- 'elementor-v2-ui',
259		- 'elementor-v2-icons',
260		- 'elementor-v2-onboarding',
261		- 'elementor-v2-site-builder',
262	215	'react',
263	216	'react-dom',
264	217	'select2',
265	218	],
		@@ -268,9 +221,10 @@
268	221	);
269	222
270	223	$this->enqueue_dark_theme_detection_script();
271	224
272		- Assets_Translation_Loader::for_handles( [ 'elementor-app-packages', 'elementor-app' ], 'elementor' );
	225	+ wp_set_script_translations( 'elementor-app-packages', 'elementor' );
	226	+ wp_set_script_translations( 'elementor-app', 'elementor' );
273	227
274	228	$this->print_config();
275	229	}
276	230
		@@ -287,42 +241,23 @@
287	241
288	242	$this->print_config( 'elementor-app-loader' );
289	243	}
290	244
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	245	public function __construct() {
304		- $this->register_import_export_customization_experiment();
	246	+ $this->add_component( 'site-editor', new Modules\SiteEditor\Module() );
305	247
306		- $this->add_component( 'site-editor', new SiteEditorModule() );
307		- $this->add_component( 'site-builder', new SiteBuilderModule() );
308		-
309	248	if ( current_user_can( 'manage_options' ) || Utils::is_wp_cli() ) {
310		- $this->add_component( 'import-export', new ImportExportModule() );
	249	+ $this->add_component( 'import-export', new Modules\ImportExport\Module() );
311	250
312		- if ( Plugin::$instance->experiments->is_feature_active( 'import-export-customization' ) ) {
313		- $this->add_component( 'import-export-customization', new ImportExportCustomizationModule() );
314		- }
315		-
316	251	// Kit library is depended on import-export
317		- $this->add_component( 'kit-library', new KitLibraryModule() );
	252	+ $this->add_component( 'kit-library', new Modules\KitLibrary\Module() );
318	253	}
319	254
320		- $this->add_component( 'onboarding', new OnboardingModule() );
	255	+ $this->add_component( 'onboarding', new Modules\Onboarding\Module() );
321	256
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		- } );
	257	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	258	+ $this->register_admin_menu( $admin_menu );
	259	+ }, Source_Local::ADMIN_MENU_PRIORITY + 10 );
325	260
326	261	// Happens after WP plugin page validation.
327	262	add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] );
328	263