← All changes | core/common/app.php +9 -68 4.2.0-dev2 → 3.2.4 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.
		@@ -100,24 +87,11 @@
100	87	* @access public
101	88	*/
102	89	public function register_scripts() {
103	90	wp_register_script(
104		- 'elementor-vendors-redux',
105		- $this->get_js_assets_url( 'vendors-redux' ),
106		- [
107		- 'react',
108		- 'react-dom',
109		- ],
110		- ELEMENTOR_VERSION,
111		- true
112		- );
113		-
114		- wp_register_script(
115	91	'elementor-common-modules',
116	92	$this->get_js_assets_url( 'common-modules' ),
117		- [
118		- 'elementor-vendors-redux',
119		- ],
	93	+ [],
120	94	ELEMENTOR_VERSION,
121	95	true
122	96	);
123	97
		@@ -146,9 +120,9 @@
146	120	$this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ),
147	121	[
148	122	'jquery-ui-position',
149	123	],
150		- '4.9.0',
	124	+ '4.8.1',
151	125	true
152	126	);
153	127
154	128	wp_enqueue_script(
		@@ -159,12 +133,10 @@
159	133	'jquery-ui-draggable',
160	134	'backbone-marionette',
161	135	'backbone-radio',
162	136	'elementor-common-modules',
163		- 'elementor-web-cli',
164	137	'elementor-dialog',
165	138	'wp-api-request',
166		- 'elementor-dev-tools',
167	139	],
168	140	ELEMENTOR_VERSION,
169	141	true
170	142	);
		@@ -189,9 +161,9 @@
189	161	wp_register_style(
190	162	'elementor-icons',
191	163	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
192	164	[],
193		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	165	+ '5.11.0'
194	166	);
195	167
196	168	wp_enqueue_style(
197	169	'elementor-common',
		@@ -200,15 +172,8 @@
200	172	'elementor-icons',
201	173	],
202	174	ELEMENTOR_VERSION
203	175	);
204		-
205		- wp_enqueue_style(
206		- 'e-theme-ui-light',
207		- $this->get_css_assets_url( 'theme-light' ),
208		- [],
209		- ELEMENTOR_VERSION
210		- );
211	176	}
212	177
213	178	/**
214	179	* Add template.
		@@ -242,9 +207,9 @@
242	207	* @access public
243	208	*/
244	209	public function print_templates() {
245	210	foreach ( $this->templates as $template ) {
246		- echo $template; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	211	+ echo $template;
247	212	}
248	213	}
249	214
250	215	/**
		@@ -258,46 +223,23 @@
258	223	* @return array
259	224	*/
260	225	protected function get_init_settings() {
261	226	$active_experimental_features = Plugin::$instance->experiments->get_active_features();
262		- $all_experimental_features = Plugin::$instance->experiments->get_features();
263	227
264	228	$active_experimental_features = array_fill_keys( array_keys( $active_experimental_features ), true );
265		- $all_experimental_features = array_map(
266		- function( $feature ) {
267		- return Plugin::$instance->experiments->is_feature_active( $feature['name'] );
268		- },
269		- $all_experimental_features
270		- );
271	229
272		- $config = [
	230	+ return [
273	231	'version' => ELEMENTOR_VERSION,
274	232	'isRTL' => is_rtl(),
275	233	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
276		- 'isElementorDebug' => Utils::is_elementor_debug(),
	234	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
277	235	'activeModules' => array_keys( $this->get_components() ),
278	236	'experimentalFeatures' => $active_experimental_features,
279		- 'allExperimentalFeatures' => $all_experimental_features,
280	237	'urls' => [
281	238	'assets' => ELEMENTOR_ASSETS_URL,
282	239	'rest' => get_rest_url(),
283	240	],
284		- 'filesUpload' => [
285		- 'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
286		- ],
287		- 'editor_events' => Events_Manager::get_editor_events_config(),
288	241	];
289		-
290		- /**
291		- * Localize common settings.
292		- *
293		- * Filters the editor localized settings.
294		- *
295		- * @since 1.0.0
296		- *
297		- * @param array $config Common configuration.
298		- */
299		- return apply_filters( 'elementor/common/localize_settings', $config );
300	242	}
301	243
302	244	/**
303	245	* Add default templates.
		@@ -302,9 +244,8 @@
302	244	/**
303	245	* Add default templates.
304	246	*
305	247	* Register common app default templates.
306		- *
307	248	* @since 2.3.0
308	249	* @access private
309	250	*/
310	251	private function add_default_templates() {