← All changes | core/common/app.php +6 -48 4.3.0-beta2 → 3.6.0-beta1 View file →

		@@ -5,13 +5,10 @@
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	8	use Elementor\Core\Common\Modules\EventTracker\Module as Event_Tracker;
9		-use Elementor\Core\Common\Modules\EventsManager\Module as Events_Manager;
10	9	use Elementor\Core\Files\Uploads_Manager;
11		-use Elementor\Icons_Manager;
12	10	use Elementor\Plugin;
13		-use Elementor\Utils;
14	11
15	12	if ( ! defined( 'ABSPATH' ) ) {
16	13	exit; // Exit if accessed directly.
17	14	}
		@@ -35,11 +32,11 @@
35	32	*/
36	33	public function __construct() {
37	34	$this->add_default_templates();
38	35
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 );
	36	+ add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ] );
	37	+ add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ] );
	38	+ add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] );
42	39
43	40	add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'register_styles' ] );
44	41	add_action( 'admin_enqueue_scripts', [ $this, 'register_styles' ] );
45	42	add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 9 );
		@@ -68,14 +65,8 @@
68	65
69	66	$this->add_component( 'connect', new Connect() );
70	67
71	68	$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	69	}
79	70
80	71	/**
81	72	* Get name.
		@@ -100,24 +91,11 @@
100	91	* @access public
101	92	*/
102	93	public function register_scripts() {
103	94	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	95	'elementor-common-modules',
116	96	$this->get_js_assets_url( 'common-modules' ),
117		- [
118		- 'elementor-vendors-redux',
119		- ],
	97	+ [],
120	98	ELEMENTOR_VERSION,
121	99	true
122	100	);
123	101
		@@ -159,12 +137,10 @@
159	137	'jquery-ui-draggable',
160	138	'backbone-marionette',
161	139	'backbone-radio',
162	140	'elementor-common-modules',
163		- 'elementor-web-cli',
164	141	'elementor-dialog',
165	142	'wp-api-request',
166		- 'elementor-dev-tools',
167	143	],
168	144	ELEMENTOR_VERSION,
169	145	true
170	146	);
		@@ -189,9 +165,9 @@
189	165	wp_register_style(
190	166	'elementor-icons',
191	167	$this->get_css_assets_url( 'elementor-icons', 'assets/lib/eicons/css/' ),
192	168	[],
193		- Icons_Manager::ELEMENTOR_ICONS_VERSION
	169	+ '5.15.0'
194	170	);
195	171
196	172	wp_enqueue_style(
197	173	'elementor-common',
		@@ -200,15 +176,8 @@
200	176	'elementor-icons',
201	177	],
202	178	ELEMENTOR_VERSION
203	179	);
204		-
205		- wp_enqueue_style(
206		- 'e-theme-ui-light',
207		- $this->get_css_assets_url( 'theme-light' ),
208		- [],
209		- ELEMENTOR_VERSION
210		- );
211	180	}
212	181
213	182	/**
214	183	* Add template.
		@@ -258,26 +227,18 @@
258	227	* @return array
259	228	*/
260	229	protected function get_init_settings() {
261	230	$active_experimental_features = Plugin::$instance->experiments->get_active_features();
262		- $all_experimental_features = Plugin::$instance->experiments->get_features();
263	231
264	232	$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	233
272	234	$config = [
273	235	'version' => ELEMENTOR_VERSION,
274	236	'isRTL' => is_rtl(),
275	237	'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ),
276		- 'isElementorDebug' => Utils::is_elementor_debug(),
	238	+ 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ),
277	239	'activeModules' => array_keys( $this->get_components() ),
278	240	'experimentalFeatures' => $active_experimental_features,
279		- 'allExperimentalFeatures' => $all_experimental_features,
280	241	'urls' => [
281	242	'assets' => ELEMENTOR_ASSETS_URL,
282	243	'rest' => get_rest_url(),
283	244	],
		@@ -283,10 +244,8 @@
283	244	],
284	245	'filesUpload' => [
285	246	'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(),
286	247	],
287		- 'editor_events' => Events_Manager::get_editor_events_config(),
288		- 'allowedHTMLWrapperTags' => Utils::get_allowed_html_wrapper_tags(),
289	248	];
290	249
291	250	/**
292	251	* Localize common settings.
		@@ -303,9 +262,8 @@
303	262	/**
304	263	* Add default templates.
305	264	*
306	265	* Register common app default templates.
307		- *
308	266	* @since 2.3.0
309	267	* @access private
310	268	*/
311	269	private function add_default_templates() {