← All changes | includes/base/element-base.php +23 -62 4.0.9 → 3.22.0-beta1 View file →

		@@ -119,12 +119,8 @@
119	119	public function get_script_depends() {
120	120	return $this->depended_scripts;
121	121	}
122	122
123		- public function get_global_scripts() {
124		- return [ 'elementor-frontend' ];
125		- }
126		-
127	123	/**
128	124	* Enqueue scripts.
129	125	*
130	126	* Registers all the scripts defined as element dependencies and enqueues
		@@ -134,9 +130,9 @@
134	130	* @access public
135	131	*/
136	132	final public function enqueue_scripts() {
137	133	$deprecated_scripts = [
138		- // Insert here when you have a deprecated script.
	134	+ //Insert here when you have a deprecated script
139	135	];
140	136
141	137	foreach ( $this->get_script_depends() as $script ) {
142	138	if ( isset( $deprecated_scripts[ $script ] ) ) {
		@@ -144,16 +140,10 @@
144	140	}
145	141
146	142	wp_enqueue_script( $script );
147	143	}
148		-
149		- foreach ( $this->get_global_scripts() as $script ) {
150		- wp_enqueue_script( $script );
151		- }
152	144	}
153	145
154		- public function register_frontend_handlers() {}
155		-
156	146	/**
157	147	* Get style dependencies.
158	148	*
159	149	* Retrieve the list of style dependencies the element requires.
		@@ -297,9 +287,9 @@
297	287
298	288	/**
299	289	* Whether the element returns dynamic content.
300	290	*
301		- * Set to determine whether to cache the element output or not.
	291	+ * set to determine whether to cache the element output or not.
302	292	*
303	293	* @since 3.22.0
304	294	* @access protected
305	295	*
		@@ -406,14 +396,15 @@
406	396	* @since 2.8.0
407	397	* @access public
408	398	*
409	399	* @param array|string $element The HTML element.
410		- * @param array $url_control Array of link settings.
411		- * @param bool $overwrite Optional. Whether to overwrite existing
412		- * attribute. Default is false, not to overwrite.
	400	+ * @param array $url_control Array of link settings.
	401	+ * @param bool $overwrite Optional. Whether to overwrite existing
	402	+ * attribute. Default is false, not to overwrite.
413	403	*
414	404	* @return Element_Base Current instance of the element.
415	405	*/
	406	+
416	407	public function add_link_attributes( $element, array $url_control, $overwrite = false ) {
417	408	$attributes = [];
418	409
419	410	if ( ! empty( $url_control['url'] ) ) {
		@@ -430,9 +421,9 @@
430	421	$attributes['rel'] = 'nofollow';
431	422	}
432	423
433	424	if ( ! empty( $url_control['custom_attributes'] ) ) {
434		- // Custom URL attributes should come as a string of comma-delimited key|value pairs.
	425	+ // Custom URL attributes should come as a string of comma-delimited key|value pairs
435	426	$attributes = array_merge( $attributes, Utils::parse_custom_attributes( $url_control['custom_attributes'] ) );
436	427	}
437	428
438	429	if ( $attributes ) {
		@@ -453,11 +444,9 @@
453	444	public function print_element() {
454	445	$element_type = $this->get_type();
455	446
456	447	if ( $this->should_render_shortcode() ) {
457		- $unique_id = apply_filters( 'elementor/element_cache/unique_id', '' );
458		-
459		- echo '[elementor-element k="' . esc_attr( $unique_id ) . '" data="' . esc_attr( base64_encode( wp_json_encode( $this->get_raw_data() ) ) ) . '"]';
	448	+ echo '[elementor-element data="' . esc_attr( base64_encode( wp_json_encode( $this->get_raw_data() ) ) ) . '"]';
460	449	return;
461	450	}
462	451
463	452	/**
		@@ -523,10 +512,8 @@
523	512	// PHPCS - The content has already been escaped by the `render` method.
524	513	echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
525	514	$this->after_render();
526	515
527		- // TODO: Remove this in the future
528		- // Since version 3.24.0 page scripts/styles are handled by `page_assets`.
529	516	$this->enqueue_scripts();
530	517	$this->enqueue_styles();
531	518	}
532	519
		@@ -571,13 +558,15 @@
571	558	if ( $this->is_dynamic_content() ) {
572	559	return true;
573	560	}
574	561
	562	+ if ( empty( $raw_data['settings']['__dynamic__'] ) ) {
	563	+ return false;
	564	+ }
	565	+
575	566	$is_dynamic_content = apply_filters( 'elementor/element/is_dynamic_content', false, $raw_data, $this );
576	567
577		- $has_dynamic_tag = $this->has_element_dynamic_tag( $raw_data['settings'] );
578		-
579		- if ( $is_dynamic_content || $has_dynamic_tag ) {
	568	+ if ( $is_dynamic_content ) {
580	569	return true;
581	570	}
582	571
583	572	return false;
		@@ -582,26 +571,8 @@
582	571
583	572	return false;
584	573	}
585	574
586		- private function has_element_dynamic_tag( $element_settings ): bool {
587		- if ( is_array( $element_settings ) ) {
588		- if ( ! empty( $element_settings['__dynamic__'] ) ) {
589		- return true;
590		- }
591		-
592		- foreach ( $element_settings as $value ) {
593		- $has_dynamic = $this->has_element_dynamic_tag( $value );
594		-
595		- if ( $has_dynamic ) {
596		- return true;
597		- }
598		- }
599		- }
600		-
601		- return false;
602		- }
603		-
604	575	/**
605	576	* Get the element raw data.
606	577	*
607	578	* Retrieve the raw element data, including the id, type, settings, child
		@@ -704,9 +675,9 @@
704	675	* @param array|null $controls The available controls.
705	676	*
706	677	* @return array Element data.
707	678	*/
708		- public static function on_import_update_dynamic_content( array $config, array $data, $controls = null ): array {
	679	+ public static function on_import_update_dynamic_content( array $config, array $data, $controls = null ) : array {
709	680	$tags_manager = Plugin::$instance->dynamic_tags;
710	681
711	682	if ( empty( $config['settings'][ $tags_manager::DYNAMIC_SETTING_KEY ] ) ) {
712	683	return $config;
		@@ -769,9 +740,8 @@
769	740	'elementor-element-' . $id,
770	741	],
771	742	'data-id' => $id,
772	743	'data-element_type' => $this->get_type(),
773		- 'data-e-type' => $this->get_type(),
774	744	] );
775	745
776	746	$class_settings = [];
777	747
		@@ -796,15 +766,15 @@
796	766	}
797	767
798	768	$_animation = ! empty( $settings['_animation'] );
799	769	$animation = ! empty( $settings['animation'] );
800		- $has_animation = ( $_animation && 'none' !== $settings['_animation'] ) || ( $animation && 'none' !== $settings['animation'] );
	770	+ $has_animation = $_animation && 'none' !== $settings['_animation'] || $animation && 'none' !== $settings['animation'];
801	771
802	772	if ( $has_animation ) {
803	773	$is_static_render_mode = Plugin::$instance->frontend->is_static_render_mode();
804	774
805	775	if ( ! $is_static_render_mode ) {
806		- // Hide the element until the animation begins.
	776	+ // Hide the element until the animation begins
807	777	$this->add_render_attribute( '_wrapper', 'class', 'elementor-invisible' );
808	778	}
809	779	}
810	780
		@@ -832,15 +802,13 @@
832	802	* Register the Transform controls in the advanced tab of the element.
833	803	*
834	804	* Previously registered under the Widget_Common class, but registered a more fundamental level now to enable access from other widgets.
835	805	*
836		- * @param string $element_selector
837		- * @param string $transform_selector_class
838		- * @return void
839	806	* @since 3.9.0
840	807	* @access protected
	808	+ * @return void
841	809	*/
842		- protected function register_transform_section( $element_selector = '', $transform_selector_class = ' > .elementor-widget-container' ) {
	810	+ protected function register_transform_section( $element_selector = '' ) {
843	811	$default_unit_values_deg = [];
844	812	$default_unit_values_ms = [];
845	813
846	814	// Set the default unit sizes for all active breakpoints.
		@@ -869,8 +837,9 @@
869	837	$this->start_controls_tabs( '_tabs_positioning' );
870	838
871	839	$transform_prefix_class = 'e-';
872	840	$transform_return_value = 'transform';
	841	+ $transform_selector_class = ' > .elementor-widget-container';
873	842	$transform_css_modifier = '';
874	843
875	844	if ( 'con' === $element_selector ) {
876	845	$transform_selector_class = '.e-' . $element_selector;
		@@ -933,9 +902,8 @@
933	902	],
934	903	'condition' => [
935	904	"_transform_rotate_popover{$tab}!" => '',
936	905	],
937		- 'frontend_available' => true,
938	906	]
939	907	);
940	908
941	909	$this->add_responsive_control(
		@@ -1313,9 +1281,9 @@
1313	1281	'relation' => 'or',
1314	1282	'terms' => array_merge( $transform_origin_conditions, $transform_origin_conditions_hover ),
1315	1283	];
1316	1284
1317		- // Will override motion effect transform-origin.
	1285	+ // Will override motion effect transform-origin
1318	1286	$this->add_responsive_control(
1319	1287	'motion_fx_transform_x_anchor_point',
1320	1288	[
1321	1289	'label' => esc_html__( 'X Anchor Point', 'elementor' ),
		@@ -1341,9 +1309,9 @@
1341	1309	],
1342	1310	]
1343	1311	);
1344	1312
1345		- // Will override motion effect transform-origin.
	1313	+ // Will override motion effect transform-origin
1346	1314	$this->add_responsive_control(
1347	1315	'motion_fx_transform_y_anchor_point',
1348	1316	[
1349	1317	'label' => esc_html__( 'Y Anchor Point', 'elementor' ),
		@@ -1494,11 +1462,8 @@
1494	1462
1495	1463	/**
1496	1464	* A Base method for sanitizing the settings before save.
1497	1465	* This method is meant to be overridden by the element.
1498		- *
1499		- * @param array $settings
1500		- * @return array
1501	1466	*/
1502	1467	protected function on_save( array $settings ) {
1503	1468	return $settings;
1504	1469	}
		@@ -1517,9 +1482,9 @@
1517	1482	*/
1518	1483	private function get_child_type( $element_data ) {
1519	1484	$child_type = $this->_get_default_child_type( $element_data );
1520	1485
1521		- // If it's not a valid widget ( like a deactivated plugin ).
	1486	+ // If it's not a valid widget ( like a deactivated plugin )
1522	1487	if ( ! $child_type ) {
1523	1488	return false;
1524	1489	}
1525	1490
		@@ -1564,12 +1529,8 @@
1564	1529	$this->add_child( $child_data );
1565	1530	}
1566	1531	}
1567	1532
1568		- public function has_widget_inner_wrapper(): bool {
1569		- return true;
1570		- }
1571		-
1572	1533	/**
1573	1534	* Element base constructor.
1574	1535	*
1575	1536	* Initializing the element base class using `$data` and `$args`.
		@@ -1582,9 +1543,9 @@
1582	1543	*
1583	1544	* @param array $data Optional. Element data. Default is an empty array.
1584	1545	* @param array|null $args Optional. Element default arguments. Default is null.
1585	1546	**/
1586		- public function __construct( array $data = [], ?array $args = null ) {
	1547	+ public function __construct( array $data = [], array $args = null ) {
1587	1548	if ( $data ) {
1588	1549	$this->is_type_instance = false;
1589	1550	} elseif ( $args ) {
1590	1551	$this->default_args = $args;