← All changes | app/app.php +14 -82 4.0.9 → 3.19.2 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;
		@@ -10,21 +9,9 @@
10	9	use Elementor\Plugin;
11	10	use Elementor\TemplateLibrary\Source_Local;
12	11	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		-
27	14	if ( ! defined( 'ABSPATH' ) ) {
28	15	exit; // Exit if accessed directly.
29	16	}
30	17
		@@ -49,10 +36,10 @@
49	36	public function get_base_url() {
50	37	return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION );
51	38	}
52	39
53		- private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) {
54		- $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() );
55	42	}
56	43
57	44	public function fix_submenu( $menu ) {
58	45	global $submenu;
		@@ -92,10 +79,8 @@
92	79	] );
93	80
94	81	$this->enqueue_assets();
95	82
96		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
97		-
98	83	// Setup default heartbeat options
99	84	// TODO: Enable heartbeat.
100	85	add_filter( 'heartbeat_settings', function( $settings ) {
101	86	$settings['interval'] = 15;
		@@ -117,14 +102,8 @@
117	102	'hasPro' => Utils::has_pro(),
118	103	'admin_url' => admin_url(),
119	104	'login_url' => wp_login_url(),
120	105	'base_url' => $this->get_base_url(),
121		- 'home_url' => home_url(),
122		- 'promotion' => Filtered_Promotions_Manager::get_filtered_promotion_data(
123		- [ 'upgrade_url' => 'https://go.elementor.com/go-pro-theme-builder/' ],
124		- 'elementor/site-editor/promotion',
125		- 'upgrade_url'
126		- ),
127	106	];
128	107	}
129	108
130	109	private function render() {
		@@ -131,16 +110,16 @@
131	110	require __DIR__ . '/view.php';
132	111	}
133	112
134	113	/**
135		- * Get Elementor editor theme color preference.
	114	+ * Get Elementor UI theme preference.
136	115	*
137		- * Retrieve the user theme color preference as defined by editor preferences manager.
	116	+ * Retrieve the user UI theme preference as defined by editor preferences manager.
138	117	*
139	118	* @since 3.0.0
140	119	* @access private
141	120	*
142		- * @return string Preferred editor theme.
	121	+ * @return string Preferred UI theme.
143	122	*/
144	123	private function get_elementor_ui_theme_preference() {
145	124	$editor_preferences = SettingsManager::get_settings_managers( 'editorPreferences' );
146	125
		@@ -162,38 +141,11 @@
162	141	{ document.body.classList.add( `eps-theme-dark` ); }' );
163	142	}
164	143	}
165	144
166		- private function register_packages() {
167		- $assets_config_provider = ( new Assets_Config_Provider() )
168		- ->set_path_resolver( function ( $name ) {
169		- return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php";
170		- } );
171		-
172		- Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding' ] )
173		- ->each( function( $package ) use ( $assets_config_provider ) {
174		- $suffix = Utils::is_script_debug() ? '' : '.min';
175		- $config = $assets_config_provider->load( $package )->get( $package );
176		-
177		- if ( ! $config ) {
178		- return;
179		- }
180		-
181		- wp_register_script(
182		- $config['handle'],
183		- ELEMENTOR_ASSETS_URL . "js/packages/{$package}/{$package}{$suffix}.js",
184		- $config['deps'],
185		- ELEMENTOR_VERSION,
186		- true
187		- );
188		- } );
189		- }
190		-
191	145	private function enqueue_assets() {
192	146	Plugin::$instance->init_common();
193	147
194		- $this->register_packages();
195		-
196	148	/** @var WebCLIModule $web_cli */
197	149	$web_cli = Plugin::$instance->modules_manager->get_modules( 'web-cli' );
198	150	$web_cli->register_scripts();
199	151
		@@ -253,11 +205,8 @@
253	205	$this->get_js_assets_url( 'app' ),
254	206	[
255	207	'wp-url',
256	208	'wp-i18n',
257		- 'elementor-v2-ui',
258		- 'elementor-v2-icons',
259		- 'elementor-v2-onboarding',
260	209	'react',
261	210	'react-dom',
262	211	'select2',
263	212	],
		@@ -266,9 +215,10 @@
266	215	);
267	216
268	217	$this->enqueue_dark_theme_detection_script();
269	218
270		- Assets_Translation_Loader::for_handles( [ 'elementor-app-packages', 'elementor-app' ], 'elementor' );
	219	+ wp_set_script_translations( 'elementor-app-packages', 'elementor' );
	220	+ wp_set_script_translations( 'elementor-app', 'elementor' );
271	221
272	222	$this->print_config();
273	223	}
274	224
		@@ -285,41 +235,23 @@
285	235
286	236	$this->print_config( 'elementor-app-loader' );
287	237	}
288	238
289		- private function register_import_export_customization_experiment() {
290		- Plugin::$instance->experiments->add_feature( [
291		- 'name' => 'import-export-customization',
292		- 'title' => esc_html__( 'Import/Export Customization', 'elementor' ),
293		- 'description' => esc_html__( 'Enhanced import/export for website templates. Selectively include site content, templates, and settings with advanced granular control.', 'elementor' ),
294		- 'release_status' => ExperimentsManager::RELEASE_STATUS_BETA,
295		- 'default' => ExperimentsManager::STATE_ACTIVE,
296		- 'hidden' => true,
297		- 'mutable' => false,
298		- ] );
299		- }
300		-
301	239	public function __construct() {
302		- $this->register_import_export_customization_experiment();
	240	+ $this->add_component( 'site-editor', new Modules\SiteEditor\Module() );
303	241
304		- $this->add_component( 'site-editor', new SiteEditorModule() );
305		-
306	242	if ( current_user_can( 'manage_options' ) || Utils::is_wp_cli() ) {
307		- $this->add_component( 'import-export', new ImportExportModule() );
	243	+ $this->add_component( 'import-export', new Modules\ImportExport\Module() );
308	244
309		- if ( Plugin::$instance->experiments->is_feature_active( 'import-export-customization' ) ) {
310		- $this->add_component( 'import-export-customization', new ImportExportCustomizationModule() );
311		- }
312		-
313	245	// Kit library is depended on import-export
314		- $this->add_component( 'kit-library', new KitLibraryModule() );
	246	+ $this->add_component( 'kit-library', new Modules\KitLibrary\Module() );
315	247	}
316	248
317		- $this->add_component( 'onboarding', new OnboardingModule() );
	249	+ $this->add_component( 'onboarding', new Modules\Onboarding\Module() );
318	250
319		- add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
320		- $this->register_editor_one_menu( $menu_data_provider );
321		- } );
	251	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	252	+ $this->register_admin_menu( $admin_menu );
	253	+ }, Source_Local::ADMIN_MENU_PRIORITY + 10 );
322	254
323	255	// Happens after WP plugin page validation.
324	256	add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] );
325	257