← All changes | core/common/app.php +6 -48 4.1.2 → 3.6.0-dev10 View file →

		@@ -4,14 +4,10 @@
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	8	use Elementor\Core\Files\Uploads_Manager;
11		-use Elementor\Icons_Manager;
12	9	use Elementor\Plugin;
13		-use Elementor\Utils;
14	10
15	11	if ( ! defined( 'ABSPATH' ) ) {
16	12	exit; // Exit if accessed directly.
17	13	}
		@@ -35,11 +31,11 @@
35	31	*/
36	32	public function __construct() {
37	33	$this->add_default_templates();
38	34
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 );
	35	+ add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ] );
	36	+ add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ] );
	37	+ add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
42	38
43	39	add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'register_styles' ] );
44	40	add_action( 'admin_enqueue_scripts', [ $this, 'register_styles' ] );
45	41	add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 9 );
		@@ -66,16 +62,8 @@
66	62	}
67	63	}
68	64
69	65	$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	66	}
79	67
80	68	/**
81	69	* Get name.
		@@ -146,12 +134,10 @@
146	134	'jquery-ui-draggable',
147	135	'backbone-marionette',
148	136	'backbone-radio',
149	137	'elementor-common-modules',
150		- 'elementor-web-cli',
151	138	'elementor-dialog',
152	139	'wp-api-request',
153		- 'elementor-dev-tools',
154	140	],
155	141	ELEMENTOR_VERSION,
156	142	true
157	143	);
		@@ -176,9 +162,9 @@
176	162	wp_register_style(
177	163	'elementor-icons',
178	164	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
179	165	[],
180		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	166	+ '5.13.0'
181	167	);
182	168
183	169	wp_enqueue_style(
184	170	'elementor-common',
		@@ -187,15 +173,8 @@
187	173	'elementor-icons',
188	174	],
189	175	ELEMENTOR_VERSION
190	176	);
191		-
192		- wp_enqueue_style(
193		- 'e-theme-ui-light',
194		- $this->get_css_assets_url( 'theme-light' ),
195		- [],
196		- ELEMENTOR_VERSION
197		- );
198	177	}
199	178
200	179	/**
201	180	* Add template.
		@@ -245,26 +224,18 @@
245	224	* @return array
246	225	*/
247	226	protected function get_init_settings() {
248	227	$active_experimental_features = Plugin::$instance->experiments->get_active_features();
249		- $all_experimental_features = Plugin::$instance->experiments->get_features();
250	228
251	229	$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	230
259		- $config = [
	231	+ return [
260	232	'version' => ELEMENTOR_VERSION,
261	233	'isRTL' => is_rtl(),
262	234	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
263		- 'isElementorDebug' => Utils::is_elementor_debug(),
	235	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
264	236	'activeModules' => array_keys( $this->get_components() ),
265	237	'experimentalFeatures' => $active_experimental_features,
266		- 'allExperimentalFeatures' => $all_experimental_features,
267	238	'urls' => [
268	239	'assets' => ELEMENTOR_ASSETS_URL,
269	240	'rest' => get_rest_url(),
270	241	],
		@@ -270,21 +241,9 @@
270	241	],
271	242	'filesUpload' => [
272	243	'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
273	244	],
274		- 'editor_events' => Events_Manager::get_editor_events_config(),
275	245	];
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	246	}
288	247
289	248	/**
290	249	* Add default templates.
		@@ -289,9 +248,8 @@
289	248	/**
290	249	* Add default templates.
291	250	*
292	251	* Register common app default templates.
293		- *
294	252	* @since 2.3.0
295	253	* @access private
296	254	*/
297	255	private function add_default_templates() {