← All changes | includes/widgets/text-editor.php +17 -174 4.2.1 → 3.20.0-dev2 View file →

		@@ -90,36 +90,8 @@
90	90	return [ 'text', 'editor' ];
91	91	}
92	92
93	93	/**
94		- * Get style dependencies.
95		- *
96		- * Retrieve the list of style dependencies the widget requires.
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		- * @since 3.24.0
105		- * @access public
106		- *
107		- * @return array Widget style dependencies.
108		- */
109		- 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;
115		- }
116		-
117		- public function has_widget_inner_wrapper(): bool {
118		- return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
119		- }
120		-
121		- /**
122	94	* Register text editor widget controls.
123	95	*
124	96	* Adds different input fields to allow the user to change and customize the widget settings.
125	97	*
		@@ -150,25 +122,8 @@
150	122	'label_off' => esc_html__( 'Off', 'elementor' ),
151	123	'label_on' => esc_html__( 'On', 'elementor' ),
152	124	'prefix_class' => 'elementor-drop-cap-',
153	125	'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	126	]
172	127	);
173	128
174	129	$this->add_responsive_control(
		@@ -257,10 +212,10 @@
257	212	[
258	213	'label' => esc_html__( 'Alignment', 'elementor' ),
259	214	'type' => Controls_Manager::CHOOSE,
260	215	'options' => [
261		- 'start' => [
262		- 'title' => esc_html__( 'Start', 'elementor' ),
	216	+ 'left' => [
	217	+ 'title' => esc_html__( 'Left', 'elementor' ),
263	218	'icon' => 'eicon-text-align-left',
264	219	],
265	220	'center' => [
266	221	'title' => esc_html__( 'Center', 'elementor' ),
		@@ -265,10 +220,10 @@
265	220	'center' => [
266	221	'title' => esc_html__( 'Center', 'elementor' ),
267	222	'icon' => 'eicon-text-align-center',
268	223	],
269		- 'end' => [
270		- 'title' => esc_html__( 'End', 'elementor' ),
	224	+ 'right' => [
	225	+ 'title' => esc_html__( 'Right', 'elementor' ),
271	226	'icon' => 'eicon-text-align-right',
272	227	],
273	228	'justify' => [
274	229	'title' => esc_html__( 'Justified', 'elementor' ),
		@@ -274,76 +229,15 @@
274	229	'title' => esc_html__( 'Justified', 'elementor' ),
275	230	'icon' => 'eicon-text-align-justify',
276	231	],
277	232	],
278		- 'classes' => 'elementor-control-start-end',
279		- 'selectors_dictionary' => [
280		- 'left' => is_rtl() ? 'end' : 'start',
281		- 'right' => is_rtl() ? 'start' : 'end',
282		- ],
283	233	'selectors' => [
284	234	'{{WRAPPER}}' => 'text-align: {{VALUE}};',
285	235	],
286		- 'separator' => 'after',
287	236	]
288	237	);
289	238
290		- $this->add_group_control(
291		- Group_Control_Typography::get_type(),
292		- [
293		- 'name' => 'typography',
294		- 'global' => [
295		- 'default' => Global_Typography::TYPOGRAPHY_TEXT,
296		- ],
297		- ]
298		- );
299		-
300		- $this->add_group_control(
301		- Group_Control_Text_Shadow::get_type(),
302		- [
303		- 'name' => 'text_shadow',
304		- 'selector' => '{{WRAPPER}}',
305		- ]
306		- );
307		-
308		- $this->add_responsive_control(
309		- 'paragraph_spacing',
310		- [
311		- 'label' => esc_html__( 'Paragraph Spacing', 'elementor' ),
312		- 'type' => Controls_Manager::SLIDER,
313		- 'size_units' => [ 'px', 'em', 'rem', 'vh', 'custom' ],
314		- 'range' => [
315		- 'px' => [
316		- 'max' => 100,
317		- ],
318		- 'em' => [
319		- 'min' => 0.1,
320		- 'max' => 20,
321		- ],
322		- ],
323		- 'selectors' => [
324		- '{{WRAPPER}} p' => 'margin-block-end: {{SIZE}}{{UNIT}}',
325		- ],
326		- ]
327		- );
328		-
329	239	$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	240	'text_color',
347	241	[
348	242	'label' => esc_html__( 'Text Color', 'elementor' ),
349	243	'type' => Controls_Manager::COLOR,
		@@ -356,58 +250,26 @@
356	250	],
357	251	]
358	252	);
359	253
360		- $this->add_control(
361		- 'link_color',
	254	+ $this->add_group_control(
	255	+ Group_Control_Typography::get_type(),
362	256	[
363		- 'label' => esc_html__( 'Link Color', 'elementor' ),
364		- 'type' => Controls_Manager::COLOR,
365		- 'selectors' => [
366		- '{{WRAPPER}} a' => 'color: {{VALUE}};',
	257	+ 'name' => 'typography',
	258	+ 'global' => [
	259	+ 'default' => Global_Typography::TYPOGRAPHY_TEXT,
367	260	],
368	261	]
369	262	);
370	263
371		- $this->end_controls_tab();
372		-
373		- $this->start_controls_tab(
374		- 'colors_hover',
	264	+ $this->add_group_control(
	265	+ Group_Control_Text_Shadow::get_type(),
375	266	[
376		- 'label' => esc_html__( 'Hover', 'elementor' ),
	267	+ 'name' => 'text_shadow',
	268	+ 'selector' => '{{WRAPPER}}',
377	269	]
378	270	);
379	271
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	272	$this->end_controls_section();
411	273
412	274	$this->start_controls_section(
413	275	'section_drop_cap',
		@@ -522,9 +384,10 @@
522	384	'max' => 5,
523	385	],
524	386	],
525	387	'selectors' => [
526		- '{{WRAPPER}} .elementor-drop-cap' => 'margin-inline-end: {{SIZE}}{{UNIT}};',
	388	+ 'body:not(.rtl) {{WRAPPER}} .elementor-drop-cap' => 'margin-right: {{SIZE}}{{UNIT}};',
	389	+ 'body.rtl {{WRAPPER}} .elementor-drop-cap' => 'margin-left: {{SIZE}}{{UNIT}};',
527	390	],
528	391	]
529	392	);
530	393
		@@ -592,12 +455,8 @@
592	455
593	456	$editor_content = $this->get_settings_for_display( 'editor' );
594	457	$editor_content = $this->parse_text_editor( $editor_content );
595	458
596		- if ( empty( $editor_content ) ) {
597		- return;
598		- }
599		-
600	459	if ( $should_render_inline_editing ) {
601	460	$this->add_render_attribute( 'editor', 'class', [ 'elementor-text-editor', 'elementor-clearfix' ] );
602	461	}
603	462
		@@ -605,11 +464,10 @@
605	464	?>
606	465	<?php if ( $should_render_inline_editing ) { ?>
607	466	<div <?php $this->print_render_attribute_string( 'editor' ); ?>>
608	467	<?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		- ?>
	468	+ <?php // PHPCS - the main text of a widget should not be escaped.
	469	+ echo $editor_content; // phpcs:ignore WordPress.Security.EscapeOutput ?>
612	470	<?php if ( $should_render_inline_editing ) { ?>
613	471	</div>
614	472	<?php } ?>
615	473	<?php
		@@ -635,26 +493,11 @@
635	493	*
636	494	* @since 2.9.0
637	495	* @access protected
638	496	*/
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	497	protected function content_template() {
651	498	?>
652	499	<#
653		- if ( '' === settings.editor ) {
654		- return;
655		- }
656		-
657	500	const shouldRenderInlineEditing = elementorFrontend.isEditMode();
658	501
659	502	if ( shouldRenderInlineEditing ) {
660	503	view.addRenderAttribute( 'editor', 'class', [ 'elementor-text-editor', 'elementor-clearfix' ] );