← All changes | core/common/app.php +9 -63 4.1.3 → 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.
		@@ -113,9 +99,9 @@
113	99	$this->get_js_assets_url( 'backbone.marionette', 'assets/lib/backbone/' ),
114	100	[
115	101	'backbone',
116	102	],
117		- '2.4.5.e1',
	103	+ '2.4.5',
118	104	true
119	105	);
120	106
121	107	wp_register_script(
		@@ -133,9 +119,9 @@
133	119	$this->get_js_assets_url( 'dialog', 'assets/lib/dialog/' ),
134	120	[
135	121	'jquery-ui-position',
136	122	],
137		- '4.9.0',
	123	+ '4.8.1',
138	124	true
139	125	);
140	126
141	127	wp_enqueue_script(
		@@ -146,19 +132,15 @@
146	132	'jquery-ui-draggable',
147	133	'backbone-marionette',
148	134	'backbone-radio',
149	135	'elementor-common-modules',
150		- 'elementor-web-cli',
151	136	'elementor-dialog',
152	137	'wp-api-request',
153		- 'elementor-dev-tools',
154	138	],
155	139	ELEMENTOR_VERSION,
156	140	true
157	141	);
158	142
159		- wp_set_script_translations( 'elementor-common', 'elementor' );
160		-
161	143	$this->print_config();
162	144
163	145	// Used for external plugins.
164	146	do_action( 'elementor/common/after_register_scripts', $this );
		@@ -176,9 +158,9 @@
176	158	wp_register_style(
177	159	'elementor-icons',
178	160	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
179	161	[],
180		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	162	+ '5.9.1'
181	163	);
182	164
183	165	wp_enqueue_style(
184	166	'elementor-common',
		@@ -187,15 +169,8 @@
187	169	'elementor-icons',
188	170	],
189	171	ELEMENTOR_VERSION
190	172	);
191		-
192		- wp_enqueue_style(
193		- 'e-theme-ui-light',
194		- $this->get_css_assets_url( 'theme-light' ),
195		- [],
196		- ELEMENTOR_VERSION
197		- );
198	173	}
199	174
200	175	/**
201	176	* Add template.
		@@ -229,9 +204,9 @@
229	204	* @access public
230	205	*/
231	206	public function print_templates() {
232	207	foreach ( $this->templates as $template ) {
233		- echo $template; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	208	+ echo $template;
234	209	}
235	210	}
236	211
237	212	/**
		@@ -244,47 +219,19 @@
244	219	*
245	220	* @return array
246	221	*/
247	222	protected function get_init_settings() {
248		- $active_experimental_features = Plugin::$instance->experiments->get_active_features();
249		- $all_experimental_features = Plugin::$instance->experiments->get_features();
250		-
251		- $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		-
259		- $config = [
	223	+ return [
260	224	'version' => ELEMENTOR_VERSION,
261	225	'isRTL' => is_rtl(),
262	226	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
263		- 'isElementorDebug' => Utils::is_elementor_debug(),
	227	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
264	228	'activeModules' => array_keys( $this->get_components() ),
265		- 'experimentalFeatures' => $active_experimental_features,
266		- 'allExperimentalFeatures' => $all_experimental_features,
267	229	'urls' => [
268	230	'assets' => ELEMENTOR_ASSETS_URL,
269	231	'rest' => get_rest_url(),
270	232	],
271		- 'filesUpload' => [
272		- 'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
273		- ],
274		- 'editor_events' => Events_Manager::get_editor_events_config(),
275	233	];
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	234	}
288	235
289	236	/**
290	237	* Add default templates.
		@@ -289,9 +236,8 @@
289	236	/**
290	237	* Add default templates.
291	238	*
292	239	* Register common app default templates.
293		- *
294	240	* @since 2.3.0
295	241	* @access private
296	242	*/
297	243	private function add_default_templates() {