← All changes | core/common/app.php +5 -33 4.1.1 → 3.6.0-beta1 View file →

		@@ -5,13 +5,10 @@
5	5	use Elementor\Core\Common\Modules\Ajax\Module as Ajax;
6	6	use Elementor\Core\Common\Modules\Finder\Module as Finder;
7	7	use Elementor\Core\Common\Modules\Connect\Module as Connect;
8	8	use Elementor\Core\Common\Modules\EventTracker\Module as Event_Tracker;
9		-use Elementor\Core\Common\Modules\EventsManager\Module as Events_Manager;
10	9	use Elementor\Core\Files\Uploads_Manager;
11		-use Elementor\Icons_Manager;
12	10	use Elementor\Plugin;
13		-use Elementor\Utils;
14	11
15	12	if ( ! defined( 'ABSPATH' ) ) {
16	13	exit; // Exit if accessed directly.
17	14	}
		@@ -35,11 +32,11 @@
35	32	*/
36	33	public function __construct() {
37	34	$this->add_default_templates();
38	35
39		- add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ], 9 );
40		- add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ], 9 );
41		- add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ], 9 );
	36	+ add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ] );
	37	+ add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ] );
	38	+ add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
42	39
43	40	add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'register_styles' ] );
44	41	add_action( 'admin_enqueue_scripts', [ $this, 'register_styles' ] );
45	42	add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 9 );
		@@ -68,14 +65,8 @@
68	65
69	66	$this->add_component( 'connect', new Connect() );
70	67
71	68	$this->add_component( 'event-tracker', new Event_Tracker() );
72		-
73		- Plugin::$instance->experiments->add_feature( Events_Manager::get_experimental_data() );
74		-
75		- if ( Plugin::$instance->experiments->is_feature_active( Events_Manager::EXPERIMENT_NAME ) ) {
76		- $this->add_component( 'events-manager', new Events_Manager() );
77		- }
78	69	}
79	70
80	71	/**
81	72	* Get name.
		@@ -146,12 +137,10 @@
146	137	'jquery-ui-draggable',
147	138	'backbone-marionette',
148	139	'backbone-radio',
149	140	'elementor-common-modules',
150		- 'elementor-web-cli',
151	141	'elementor-dialog',
152	142	'wp-api-request',
153		- 'elementor-dev-tools',
154	143	],
155	144	ELEMENTOR_VERSION,
156	145	true
157	146	);
		@@ -176,9 +165,9 @@
176	165	wp_register_style(
177	166	'elementor-icons',
178	167	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
179	168	[],
180		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	169	+ '5.15.0'
181	170	);
182	171
183	172	wp_enqueue_style(
184	173	'elementor-common',
		@@ -187,15 +176,8 @@
187	176	'elementor-icons',
188	177	],
189	178	ELEMENTOR_VERSION
190	179	);
191		-
192		- wp_enqueue_style(
193		- 'e-theme-ui-light',
194		- $this->get_css_assets_url( 'theme-light' ),
195		- [],
196		- ELEMENTOR_VERSION
197		- );
198	180	}
199	181
200	182	/**
201	183	* Add template.
		@@ -245,26 +227,18 @@
245	227	* @return array
246	228	*/
247	229	protected function get_init_settings() {
248	230	$active_experimental_features = Plugin::$instance->experiments->get_active_features();
249		- $all_experimental_features = Plugin::$instance->experiments->get_features();
250	231
251	232	$active_experimental_features = array_fill_keys( array_keys( $active_experimental_features ), true );
252		- $all_experimental_features = array_map(
253		- function( $feature ) {
254		- return Plugin::$instance->experiments->is_feature_active( $feature['name'] );
255		- },
256		- $all_experimental_features
257		- );
258	233
259	234	$config = [
260	235	'version' => ELEMENTOR_VERSION,
261	236	'isRTL' => is_rtl(),
262	237	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
263		- 'isElementorDebug' => Utils::is_elementor_debug(),
	238	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
264	239	'activeModules' => array_keys( $this->get_components() ),
265	240	'experimentalFeatures' => $active_experimental_features,
266		- 'allExperimentalFeatures' => $all_experimental_features,
267	241	'urls' => [
268	242	'assets' => ELEMENTOR_ASSETS_URL,
269	243	'rest' => get_rest_url(),
270	244	],
		@@ -270,9 +244,8 @@
270	244	],
271	245	'filesUpload' => [
272	246	'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
273	247	],
274		- 'editor_events' => Events_Manager::get_editor_events_config(),
275	248	];
276	249
277	250	/**
278	251	* Localize common settings.
		@@ -289,9 +262,8 @@
289	262	/**
290	263	* Add default templates.
291	264	*
292	265	* Register common app default templates.
293		- *
294	266	* @since 2.3.0
295	267	* @access private
296	268	*/
297	269	private function add_default_templates() {