← All changes | core/common/app.php +8 -54 4.1.0-dev2 → 3.2.3 View file →

		@@ -4,14 +4,9 @@
4	4	use Elementor\Core\Base\App as BaseApp;
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		-use Elementor\Core\Common\Modules\EventTracker\Module as Event_Tracker;
9		-use Elementor\Core\Common\Modules\EventsManager\Module as Events_Manager;
10		-use Elementor\Core\Files\Uploads_Manager;
11		-use Elementor\Icons_Manager;
12	8	use Elementor\Plugin;
13		-use Elementor\Utils;
14	9
15	10	if ( ! defined( 'ABSPATH' ) ) {
16	11	exit; // Exit if accessed directly.
17	12	}
		@@ -35,11 +30,11 @@
35	30	*/
36	31	public function __construct() {
37	32	$this->add_default_templates();
38	33
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 );
	34	+ add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ] );
	35	+ add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ] );
	36	+ add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
42	37
43	38	add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'register_styles' ] );
44	39	add_action( 'admin_enqueue_scripts', [ $this, 'register_styles' ] );
45	40	add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 9 );
		@@ -66,16 +61,8 @@
66	61	}
67	62	}
68	63
69	64	$this->add_component( 'connect', new Connect() );
70		-
71		- $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	65	}
79	66
80	67	/**
81	68	* Get name.
		@@ -133,9 +120,9 @@
133	120	$this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ),
134	121	[
135	122	'jquery-ui-position',
136	123	],
137		- '4.9.0',
	124	+ '4.8.1',
138	125	true
139	126	);
140	127
141	128	wp_enqueue_script(
		@@ -146,12 +133,10 @@
146	133	'jquery-ui-draggable',
147	134	'backbone-marionette',
148	135	'backbone-radio',
149	136	'elementor-common-modules',
150		- 'elementor-web-cli',
151	137	'elementor-dialog',
152	138	'wp-api-request',
153		- 'elementor-dev-tools',
154	139	],
155	140	ELEMENTOR_VERSION,
156	141	true
157	142	);
		@@ -176,9 +161,9 @@
176	161	wp_register_style(
177	162	'elementor-icons',
178	163	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
179	164	[],
180		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	165	+ '5.11.0'
181	166	);
182	167
183	168	wp_enqueue_style(
184	169	'elementor-common',
		@@ -187,15 +172,8 @@
187	172	'elementor-icons',
188	173	],
189	174	ELEMENTOR_VERSION
190	175	);
191		-
192		- wp_enqueue_style(
193		- 'e-theme-ui-light',
194		- $this->get_css_assets_url( 'theme-light' ),
195		- [],
196		- ELEMENTOR_VERSION
197		- );
198	176	}
199	177
200	178	/**
201	179	* Add template.
		@@ -229,9 +207,9 @@
229	207	* @access public
230	208	*/
231	209	public function print_templates() {
232	210	foreach ( $this->templates as $template ) {
233		- echo $template; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	211	+ echo $template;
234	212	}
235	213	}
236	214
237	215	/**
		@@ -245,46 +223,23 @@
245	223	* @return array
246	224	*/
247	225	protected function get_init_settings() {
248	226	$active_experimental_features = Plugin::$instance->experiments->get_active_features();
249		- $all_experimental_features = Plugin::$instance->experiments->get_features();
250	227
251	228	$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	229
259		- $config = [
	230	+ return [
260	231	'version' => ELEMENTOR_VERSION,
261	232	'isRTL' => is_rtl(),
262	233	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
263		- 'isElementorDebug' => Utils::is_elementor_debug(),
	234	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
264	235	'activeModules' => array_keys( $this->get_components() ),
265	236	'experimentalFeatures' => $active_experimental_features,
266		- 'allExperimentalFeatures' => $all_experimental_features,
267	237	'urls' => [
268	238	'assets' => ELEMENTOR_ASSETS_URL,
269	239	'rest' => get_rest_url(),
270	240	],
271		- 'filesUpload' => [
272		- 'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
273		- ],
274		- 'editor_events' => Events_Manager::get_editor_events_config(),
275	241	];
276		-
277		- /**
278		- * Localize common settings.
279		- *
280		- * Filters the editor localized settings.
281		- *
282		- * @since 1.0.0
283		- *
284		- * @param array $config Common configuration.
285		- */
286		- return apply_filters( 'elementor/common/localize_settings', $config );
287	242	}
288	243
289	244	/**
290	245	* Add default templates.
		@@ -289,9 +244,8 @@
289	244	/**
290	245	* Add default templates.
291	246	*
292	247	* Register common app default templates.
293		- *
294	248	* @since 2.3.0
295	249	* @access private
296	250	*/
297	251	private function add_default_templates() {