← All changes | core/kits/manager.php +13 -103 4.1.3 → 3.4.7 View file →

		@@ -6,9 +6,9 @@
6	6	use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
7	7	use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
8	8	use Elementor\Plugin;
9	9	use Elementor\Core\Files\CSS\Post as Post_CSS;
10		-use Elementor\Core\Files\CSS\Post_Preview;
	10	+use Elementor\Core\Files\CSS\Post_Preview as Post_Preview;
11	11	use Elementor\Core\Documents_Manager;
12	12	use Elementor\Core\Kits\Documents\Kit;
13	13	use Elementor\TemplateLibrary\Source_Local;
14	14	use Elementor\Utils;
		@@ -20,25 +20,17 @@
20	20	class Manager {
21	21
22	22	const OPTION_ACTIVE = 'elementor_active_kit';
23	23
24		- const OPTION_PREVIOUS = 'elementor_previous_kit';
25		-
26	24	const E_HASH_COMMAND_OPEN_SITE_SETTINGS = 'e:run:panel/global/open';
27	25
28		- private $should_skip_trash_kit_confirmation = false;
29		-
30	26	public function get_active_id() {
31	27	return get_option( self::OPTION_ACTIVE );
32	28	}
33	29
34		- public function get_previous_id() {
35		- return get_option( self::OPTION_PREVIOUS );
36		- }
	30	+ public function get_active_kit() {
	31	+ $kit = Plugin::$instance->documents->get( $this->get_active_id() );
37	32
38		- public function get_kit( $kit_id ) {
39		- $kit = Plugin::$instance->documents->get( $kit_id );
40		-
41	33	if ( ! $this->is_valid_kit( $kit ) ) {
42	34	return $this->get_empty_kit_instance();
43	35	}
44	36
		@@ -44,12 +36,8 @@
44	36
45	37	return $kit;
46	38	}
47	39
48		- public function get_active_kit() {
49		- return $this->get_kit( $this->get_active_id() );
50		- }
51		-
52	40	public function get_active_kit_for_frontend() {
53	41	$kit = Plugin::$instance->documents->get_doc_for_frontend( $this->get_active_id() );
54	42
55	43	if ( ! $this->is_valid_kit( $kit ) ) {
		@@ -71,9 +59,9 @@
71	59	/**
72	60	* Returns an empty kit for situation when there is no kit in the site.
73	61	*
74	62	* @return Kit
75		- * @throws \Exception If the kit instance cannot be created.
	63	+ * @throws \Exception
76	64	*/
77	65	private function get_empty_kit_instance() {
78	66	return new Kit( [
79	67	'settings' => [],
		@@ -127,51 +115,11 @@
127	115	$kit_data['post_type'] = Source_Local::CPT;
128	116
129	117	$kit = Plugin::$instance->documents->create( 'kit', $kit_data, $kit_meta_data );
130	118
131		- if ( isset( $kit_data['settings'] ) ) {
132		- $kit->save( [ 'settings' => $kit_data['settings'] ] );
133		- }
134		-
135	119	return $kit->get_id();
136	120	}
137	121
138		- public function create_new_kit( $kit_name = '', $settings = [], $active = true ) {
139		- $kit_name = $kit_name ? $kit_name : esc_html__( 'Custom', 'elementor' );
140		-
141		- $current_kit = $this->get_active_kit();
142		-
143		- $kit_meta_data = $this->get_meta_to_preserve( $current_kit );
144		-
145		- $id = $this->create( [
146		- 'post_title' => $kit_name,
147		- 'settings' => $settings,
148		- ], $kit_meta_data );
149		-
150		- if ( $active ) {
151		- update_option( self::OPTION_PREVIOUS, $this->get_active_id() );
152		- update_option( self::OPTION_ACTIVE, $id );
153		- }
154		-
155		- return $id;
156		- }
157		-
158		- private function get_meta_to_preserve( Kit $current_kit ): array {
159		- $meta_keys_to_preserve = apply_filters( 'elementor/kit/meta_to_preserve_on_kit_import', [] );
160		-
161		- $kit_meta_data = [];
162		-
163		- foreach ( $meta_keys_to_preserve as $meta_key ) {
164		- $value = $current_kit->get_meta( $meta_key );
165		-
166		- if ( ! empty( $value ) ) {
167		- $kit_meta_data[ $meta_key ] = $value;
168		- }
169		- }
170		-
171		- return $kit_meta_data;
172		- }
173		-
174	122	public function create_default() {
175	123	return $this->create( [
176	124	'post_title' => esc_html__( 'Default Kit', 'elementor' ),
177	125	] );
		@@ -190,9 +138,9 @@
190	138	return;
191	139	}
192	140
193	141	$id = wp_insert_post( [
194		- 'post_title' => esc_html__( 'Default Kit', 'elementor' ),
	142	+ 'post_title' => __( 'Default Kit', 'elementor' ),
195	143	'post_type' => Source_Local::CPT,
196	144	'post_status' => 'publish',
197	145	'meta_input' => [
198	146	'_elementor_edit_mode' => 'builder',
		@@ -205,35 +153,8 @@
205	153	return $id;
206	154	}
207	155
208	156	/**
209		- * @param $imported_kit_id int The id of the imported kit that should be deleted.
210		- * @param $active_kit_id int The id of the kit that should set as 'active_kit' after the deletion.
211		- * @param $previous_kit_id int The id of the kit that should set as 'previous_kit' after the deletion.
212		- * @return void
213		- */
214		- public function revert( int $imported_kit_id, int $active_kit_id, int $previous_kit_id ) {
215		- // If the kit that should set as active is not a valid kit then abort the revert.
216		- if ( ! $this->is_kit( $active_kit_id ) ) {
217		- return;
218		- }
219		-
220		- // This a hacky solution to avoid from the revert process to be interrupted by the `trash_kit_confirmation`.
221		- $this->should_skip_trash_kit_confirmation = true;
222		-
223		- $kit = $this->get_kit( $imported_kit_id );
224		- $kit->force_delete();
225		-
226		- $this->should_skip_trash_kit_confirmation = false;
227		-
228		- update_option( self::OPTION_ACTIVE, $active_kit_id );
229		-
230		- if ( $this->is_kit( $previous_kit_id ) ) {
231		- update_option( self::OPTION_PREVIOUS, $previous_kit_id );
232		- }
233		- }
234		-
235		- /**
236	157	* @param Documents_Manager $documents_manager
237	158	*/
238	159	public function register_document( $documents_manager ) {
239	160	$documents_manager->register_document_type( 'kit', Kit::get_class_full_name() );
		@@ -296,9 +217,9 @@
296	217	$is_kit_preview = is_preview() && isset( $_GET['preview_id'] ) && $active_kit->get_main_id() === (int) $_GET['preview_id'];
297	218
298	219	if ( $is_kit_preview ) {
299	220	$kit = Plugin::$instance->documents->get_doc_or_auto_save( $active_kit->get_main_id(), get_current_user_id() );
300		- } elseif ( null !== $active_kit->get_main_post() && 'publish' === $active_kit->get_main_post()->post_status ) {
	221	+ } elseif ( 'publish' === $active_kit->get_main_post()->post_status ) {
301	222	$kit = $active_kit;
302	223	}
303	224
304	225	return $kit;
		@@ -319,9 +240,9 @@
319	240	* Map Scheme To Global
320	241	*
321	242	* Convert a given scheme value to its corresponding default global value
322	243	*
323		- * @param string $type 'color'/'typography'.
	244	+ * @param string $type 'color'/'typography'
324	245	* @param $value
325	246	* @return mixed
326	247	*/
327	248	private function map_scheme_to_global( $type, $value ) {
		@@ -354,9 +275,9 @@
354	275	* @access public
355	276	*/
356	277	public function convert_scheme_to_global( $scheme ) {
357	278	if ( isset( $scheme['type'] ) && isset( $scheme['value'] ) ) {
358		- // _deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
	279	+ //_deprecated_argument( $args['scheme'], '3.0.0', 'Schemes are now deprecated - use $args[\'global\'] instead.' );
359	280	return $this->map_scheme_to_global( $scheme['type'], $scheme['value'] );
360	281	}
361	282
362	283	// Typography control 'scheme' properties usually only include the string with the typography value ('1'-'4').
		@@ -365,9 +286,9 @@
365	286
366	287	public function register_controls() {
367	288	$controls_manager = Plugin::$instance->controls_manager;
368	289
369		- $controls_manager->register( new Repeater() );
	290	+ $controls_manager->register_control( Repeater::CONTROL_TYPE, new Repeater() );
370	291	}
371	292
372	293	public function is_custom_colors_enabled() {
373	294	return ! get_option( 'elementor_disable_color_schemes' );
		@@ -393,16 +314,12 @@
393	314
394	315	/**
395	316	* Send a confirm message before move a kit to trash, or if delete permanently not for trash.
396	317	*
397		- * @param $post_id
398		- * @param bool $is_permanently_delete
	318	+ * @param $post_id
	319	+ * @param false $is_permanently_delete
399	320	*/
400	321	private function before_delete_kit( $post_id, $is_permanently_delete = false ) {
401		- if ( $this->should_skip_trash_kit_confirmation ) {
402		- return;
403		- }
404		-
405	322	$document = Plugin::$instance->documents->get( $post_id );
406	323
407	324	if (
408	325	! $document ||
		@@ -443,20 +360,13 @@
443	360	}
444	361	}
445	362
446	363	if ( $document ) {
447		- $document_edit_url = add_query_arg(
448		- [
449		- 'active-document' => $this->get_active_id(),
450		- ],
451		- $document->get_edit_url()
452		- );
453		-
454	364	$admin_bar_config['elementor_edit_page']['children'][] = [
455	365	'id' => 'elementor_site_settings',
456	366	'title' => esc_html__( 'Site Settings', 'elementor' ),
457	367	'sub_title' => esc_html__( 'Site', 'elementor' ),
458		- 'href' => $document_edit_url,
	368	+ 'href' => $document->get_edit_url() . '#' . self::E_HASH_COMMAND_OPEN_SITE_SETTINGS,
459	369	'class' => 'elementor-site-settings',
460	370	'parent_class' => 'elementor-second-section',
461	371	];
462	372	}
		@@ -469,9 +379,9 @@
469	379	add_filter( 'elementor/editor/localize_settings', [ $this, 'localize_settings' ] );
470	380	add_filter( 'elementor/editor/footer', [ $this, 'render_panel_html' ] );
471	381	add_action( 'elementor/frontend/after_enqueue_styles', [ $this, 'frontend_before_enqueue_styles' ], 0 );
472	382	add_action( 'elementor/preview/enqueue_styles', [ $this, 'preview_enqueue_styles' ], 0 );
473		- add_action( 'elementor/controls/register', [ $this, 'register_controls' ] );
	383	+ add_action( 'elementor/controls/controls_registered', [ $this, 'register_controls' ] );
474	384
475	385	add_action( 'wp_trash_post', function ( $post_id ) {
476	386	$this->before_delete_kit( $post_id );
477	387	} );