← All changes | core/common/app.php +10 -77 4.2.0 → 3.0.2 View file →

		@@ -4,14 +4,8 @@
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		-use Elementor\Plugin;
13		-use Elementor\Utils;
14	8
15	9	if ( ! defined( 'ABSPATH' ) ) {
16	10	exit; // Exit if accessed directly.
17	11	}
		@@ -35,11 +29,11 @@
35	29	*/
36	30	public function __construct() {
37	31	$this->add_default_templates();
38	32
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 );
	33	+ add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ] );
	34	+ add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ] );
	35	+ add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
42	36
43	37	add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'register_styles' ] );
44	38	add_action( 'admin_enqueue_scripts', [ $this, 'register_styles' ] );
45	39	add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 9 );
		@@ -66,16 +60,8 @@
66	60	}
67	61	}
68	62
69	63	$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	64	}
79	65
80	66	/**
81	67	* Get name.
		@@ -100,24 +86,11 @@
100	86	* @access public
101	87	*/
102	88	public function register_scripts() {
103	89	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	90	'elementor-common-modules',
116	91	$this->get_js_assets_url( 'common-modules' ),
117		- [
118		- 'elementor-vendors-redux',
119		- ],
	92	+ [],
120	93	ELEMENTOR_VERSION,
121	94	true
122	95	);
123	96
		@@ -126,9 +99,9 @@
126	99	$this->get_js_assets_url( 'backbone.marionette', 'assets/lib/backbone/' ),
127	100	[
128	101	'backbone',
129	102	],
130		- '2.4.5.e1',
	103	+ '2.4.5',
131	104	true
132	105	);
133	106
134	107	wp_register_script(
		@@ -146,9 +119,9 @@
146	119	$this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ),
147	120	[
148	121	'jquery-ui-position',
149	122	],
150		- '4.9.0',
	123	+ '4.8.1',
151	124	true
152	125	);
153	126
154	127	wp_enqueue_script(
		@@ -159,19 +132,15 @@
159	132	'jquery-ui-draggable',
160	133	'backbone-marionette',
161	134	'backbone-radio',
162	135	'elementor-common-modules',
163		- 'elementor-web-cli',
164	136	'elementor-dialog',
165	137	'wp-api-request',
166		- 'elementor-dev-tools',
167	138	],
168	139	ELEMENTOR_VERSION,
169	140	true
170	141	);
171	142
172		- wp_set_script_translations( 'elementor-common', 'elementor' );
173		-
174	143	$this->print_config();
175	144
176	145	// Used for external plugins.
177	146	do_action( 'elementor/common/after_register_scripts', $this );
		@@ -189,9 +158,9 @@
189	158	wp_register_style(
190	159	'elementor-icons',
191	160	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
192	161	[],
193		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	162	+ '5.9.1'
194	163	);
195	164
196	165	wp_enqueue_style(
197	166	'elementor-common',
		@@ -200,15 +169,8 @@
200	169	'elementor-icons',
201	170	],
202	171	ELEMENTOR_VERSION
203	172	);
204		-
205		- wp_enqueue_style(
206		- 'e-theme-ui-light',
207		- $this->get_css_assets_url( 'theme-light' ),
208		- [],
209		- ELEMENTOR_VERSION
210		- );
211	173	}
212	174
213	175	/**
214	176	* Add template.
		@@ -242,9 +204,9 @@
242	204	* @access public
243	205	*/
244	206	public function print_templates() {
245	207	foreach ( $this->templates as $template ) {
246		- echo $template; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	208	+ echo $template;
247	209	}
248	210	}
249	211
250	212	/**
		@@ -257,47 +219,19 @@
257	219	*
258	220	* @return array
259	221	*/
260	222	protected function get_init_settings() {
261		- $active_experimental_features = Plugin::$instance->experiments->get_active_features();
262		- $all_experimental_features = Plugin::$instance->experiments->get_features();
263		-
264		- $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		-
272		- $config = [
	223	+ return [
273	224	'version' => ELEMENTOR_VERSION,
274	225	'isRTL' => is_rtl(),
275	226	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
276		- 'isElementorDebug' => Utils::is_elementor_debug(),
	227	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
277	228	'activeModules' => array_keys( $this->get_components() ),
278		- 'experimentalFeatures' => $active_experimental_features,
279		- 'allExperimentalFeatures' => $all_experimental_features,
280	229	'urls' => [
281	230	'assets' => ELEMENTOR_ASSETS_URL,
282	231	'rest' => get_rest_url(),
283	232	],
284		- 'filesUpload' => [
285		- 'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
286		- ],
287		- 'editor_events' => Events_Manager::get_editor_events_config(),
288	233	];
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	234	}
301	235
302	236	/**
303	237	* Add default templates.
		@@ -302,9 +236,8 @@
302	236	/**
303	237	* Add default templates.
304	238	*
305	239	* Register common app default templates.
306		- *
307	240	* @since 2.3.0
308	241	* @access private
309	242	*/
310	243	private function add_default_templates() {