← All changes | includes/widgets/text-editor.php +25 -135 4.1.5 → 3.27.4 View file →

		@@ -94,14 +94,8 @@
94	94	* Get style dependencies.
95	95	*
96	96	* Retrieve the list of style dependencies the widget requires.
97	97	*
98		- * The 'widget-text-editor' style is required only when the drop cap is used.
99		- * Therefor, style should not be loaded on the widget level, rather only on
100		- * control level when the drop cap is active.
101		- *
102		- * Only in the Editor, these style should be loaded on the widget level.
103		- *
104	98	* @since 3.24.0
105	99	* @access public
106	100	*
107	101	* @return array Widget style dependencies.
		@@ -106,13 +100,9 @@
106	100	*
107	101	* @return array Widget style dependencies.
108	102	*/
109	103	public function get_style_depends(): array {
110		- $style_dependencies = Plugin::$instance->editor->is_edit_mode() || Plugin::$instance->preview->is_preview_mode()
111		- ? [ 'widget-text-editor' ]
112		- : [];
113		-
114		- return $style_dependencies;
	104	+ return [ 'widget-text-editor' ];
115	105	}
116	106
117	107	public function has_widget_inner_wrapper(): bool {
118	108	return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
		@@ -150,25 +140,8 @@
150	140	'label_off' => esc_html__( 'Off', 'elementor' ),
151	141	'label_on' => esc_html__( 'On', 'elementor' ),
152	142	'prefix_class' => 'elementor-drop-cap-',
153	143	'frontend_available' => true,
154		- 'assets' => [
155		- 'styles' => [
156		- [
157		- 'name' => 'widget-text-editor',
158		- 'conditions' => [
159		- 'terms' => [
160		- [
161		- 'name' => 'drop_cap',
162		- 'operator' => '===',
163		- 'value' => 'yes',
164		- ],
165		- ],
166		- ],
167		- ],
168		- ],
169		-
170		- ],
171	144	]
172	145	);
173	146
174	147	$this->add_responsive_control(
		@@ -257,10 +230,10 @@
257	230	[
258	231	'label' => esc_html__( 'Alignment', 'elementor' ),
259	232	'type' => Controls_Manager::CHOOSE,
260	233	'options' => [
261		- 'start' => [
262		- 'title' => esc_html__( 'Start', 'elementor' ),
	234	+ 'left' => [
	235	+ 'title' => esc_html__( 'Left', 'elementor' ),
263	236	'icon' => 'eicon-text-align-left',
264	237	],
265	238	'center' => [
266	239	'title' => esc_html__( 'Center', 'elementor' ),
		@@ -265,10 +238,10 @@
265	238	'center' => [
266	239	'title' => esc_html__( 'Center', 'elementor' ),
267	240	'icon' => 'eicon-text-align-center',
268	241	],
269		- 'end' => [
270		- 'title' => esc_html__( 'End', 'elementor' ),
	242	+ 'right' => [
	243	+ 'title' => esc_html__( 'Right', 'elementor' ),
271	244	'icon' => 'eicon-text-align-right',
272	245	],
273	246	'justify' => [
274	247	'title' => esc_html__( 'Justified', 'elementor' ),
		@@ -274,17 +247,26 @@
274	247	'title' => esc_html__( 'Justified', 'elementor' ),
275	248	'icon' => 'eicon-text-align-justify',
276	249	],
277	250	],
278		- 'classes' => 'elementor-control-start-end',
279		- 'selectors_dictionary' => [
280		- 'left' => is_rtl() ? 'end' : 'start',
281		- 'right' => is_rtl() ? 'start' : 'end',
	251	+ 'selectors' => [
	252	+ '{{WRAPPER}}' => 'text-align: {{VALUE}};',
282	253	],
	254	+ ]
	255	+ );
	256	+
	257	+ $this->add_control(
	258	+ 'text_color',
	259	+ [
	260	+ 'label' => esc_html__( 'Text Color', 'elementor' ),
	261	+ 'type' => Controls_Manager::COLOR,
	262	+ 'default' => '',
283	263	'selectors' => [
284		- '{{WRAPPER}}' => 'text-align: {{VALUE}};',
	264	+ '{{WRAPPER}}' => 'color: {{VALUE}};',
285	265	],
286		- 'separator' => 'after',
	266	+ 'global' => [
	267	+ 'default' => Global_Colors::COLOR_TEXT,
	268	+ ],
287	269	]
288	270	);
289	271
290	272	$this->add_group_control(
		@@ -320,94 +302,13 @@
320	302	'max' => 20,
321	303	],
322	304	],
323	305	'selectors' => [
324		- '{{WRAPPER}} p' => 'margin-block-end: {{SIZE}}{{UNIT}}',
	306	+ '{{WRAPPER}} p' => 'margin-bottom: {{SIZE}}{{UNIT}}',
325	307	],
326	308	]
327	309	);
328	310
329		- $this->add_control(
330		- 'separator',
331		- [
332		- 'type' => Controls_Manager::DIVIDER,
333		- ]
334		- );
335		-
336		- $this->start_controls_tabs( 'link_colors' );
337		-
338		- $this->start_controls_tab(
339		- 'colors_normal',
340		- [
341		- 'label' => esc_html__( 'Normal', 'elementor' ),
342		- ]
343		- );
344		-
345		- $this->add_control(
346		- 'text_color',
347		- [
348		- 'label' => esc_html__( 'Text Color', 'elementor' ),
349		- 'type' => Controls_Manager::COLOR,
350		- 'default' => '',
351		- 'selectors' => [
352		- '{{WRAPPER}}' => 'color: {{VALUE}};',
353		- ],
354		- 'global' => [
355		- 'default' => Global_Colors::COLOR_TEXT,
356		- ],
357		- ]
358		- );
359		-
360		- $this->add_control(
361		- 'link_color',
362		- [
363		- 'label' => esc_html__( 'Link Color', 'elementor' ),
364		- 'type' => Controls_Manager::COLOR,
365		- 'selectors' => [
366		- '{{WRAPPER}} a' => 'color: {{VALUE}};',
367		- ],
368		- ]
369		- );
370		-
371		- $this->end_controls_tab();
372		-
373		- $this->start_controls_tab(
374		- 'colors_hover',
375		- [
376		- 'label' => esc_html__( 'Hover', 'elementor' ),
377		- ]
378		- );
379		-
380		- $this->add_control(
381		- 'link_hover_color',
382		- [
383		- 'label' => esc_html__( 'Link Color', 'elementor' ),
384		- 'type' => Controls_Manager::COLOR,
385		- 'selectors' => [
386		- '{{WRAPPER}} a:hover, {{WRAPPER}} a:focus' => 'color: {{VALUE}};',
387		- ],
388		- ]
389		- );
390		-
391		- $this->add_control(
392		- 'link_hover_color_transition_duration',
393		- [
394		- 'label' => esc_html__( 'Transition Duration', 'elementor' ),
395		- 'type' => Controls_Manager::SLIDER,
396		- 'size_units' => [ 's', 'ms', 'custom' ],
397		- 'default' => [
398		- 'unit' => 's',
399		- ],
400		- 'selectors' => [
401		- '{{WRAPPER}} a' => 'transition-duration: {{SIZE}}{{UNIT}};',
402		- ],
403		- ]
404		- );
405		-
406		- $this->end_controls_tab();
407		-
408		- $this->end_controls_tabs();
409		-
410	311	$this->end_controls_section();
411	312
412	313	$this->start_controls_section(
413	314	'section_drop_cap',
		@@ -522,9 +423,10 @@
522	423	'max' => 5,
523	424	],
524	425	],
525	426	'selectors' => [
526		- '{{WRAPPER}} .elementor-drop-cap' => 'margin-inline-end: {{SIZE}}{{UNIT}};',
	427	+ 'body:not(.rtl) {{WRAPPER}} .elementor-drop-cap' => 'margin-right: {{SIZE}}{{UNIT}};',
	428	+ 'body.rtl {{WRAPPER}} .elementor-drop-cap' => 'margin-left: {{SIZE}}{{UNIT}};',
527	429	],
528	430	]
529	431	);
530	432
		@@ -605,11 +507,10 @@
605	507	?>
606	508	<?php if ( $should_render_inline_editing ) { ?>
607	509	<div <?php $this->print_render_attribute_string( 'editor' ); ?>>
608	510	<?php } ?>
609		- <?php // PHPCS - DO NOT REMOVE THIS ECHO - THE MAIN TEXT OF A WIDGET SHOULD NOT BE ESCAPED!
610		- echo $editor_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
611		- ?>
	511	+ <?php // PHPCS - the main text of a widget should not be escaped.
	512	+ echo $editor_content; // phpcs:ignore WordPress.Security.EscapeOutput ?>
612	513	<?php if ( $should_render_inline_editing ) { ?>
613	514	</div>
614	515	<?php } ?>
615	516	<?php
		@@ -635,19 +536,8 @@
635	536	*
636	537	* @since 2.9.0
637	538	* @access protected
638	539	*/
639		- public function render_markdown(): string {
640		- $editor_content = $this->get_settings_for_display( 'editor' );
641		- $editor_content = $this->parse_text_editor( $editor_content );
642		-
643		- if ( empty( $editor_content ) ) {
644		- return '';
645		- }
646		-
647		- return \Elementor\Modules\MarkdownRender\Html_To_Markdown::convert( $editor_content );
648		- }
649		-
650	540	protected function content_template() {
651	541	?>
652	542	<#
653	543	if ( '' === settings.editor ) {