← All changes | includes/widgets/alert.php +53 -89 4.0.9 → 3.20.0-dev3 View file →

		@@ -73,31 +73,9 @@
73	73	public function get_keywords() {
74	74	return [ 'alert', 'notice', 'message' ];
75	75	}
76	76
77		- protected function is_dynamic_content(): bool {
78		- return false;
79		- }
80		-
81	77	/**
82		- * Get style dependencies.
83		- *
84		- * Retrieve the list of style dependencies the widget requires.
85		- *
86		- * @since 3.24.0
87		- * @access public
88		- *
89		- * @return array Widget style dependencies.
90		- */
91		- public function get_style_depends(): array {
92		- return [ 'widget-alert' ];
93		- }
94		-
95		- public function has_widget_inner_wrapper(): bool {
96		- return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
97		- }
98		-
99		- /**
100	78	* Register alert widget controls.
101	79	*
102	80	* Adds different input fields to allow the user to change and customize the widget settings.
103	81	*
		@@ -123,9 +101,9 @@
123	101	'success' => esc_html__( 'Success', 'elementor' ),
124	102	'warning' => esc_html__( 'Warning', 'elementor' ),
125	103	'danger' => esc_html__( 'Danger', 'elementor' ),
126	104	],
127		- 'prefix_class' => 'elementor-alert-',
	105	+ 'style_transfer' => true,
128	106	]
129	107	);
130	108
131	109	$this->add_control(
		@@ -225,12 +203,12 @@
225	203
226	204	$this->add_control(
227	205	'border_color',
228	206	[
229		- 'label' => esc_html__( 'Side Border Color', 'elementor' ),
	207	+ 'label' => esc_html__( 'Border Color', 'elementor' ),
230	208	'type' => Controls_Manager::COLOR,
231	209	'selectors' => [
232		- '{{WRAPPER}} .elementor-alert' => 'border-inline-start-color: {{VALUE}};',
	210	+ '{{WRAPPER}} .elementor-alert' => 'border-color: {{VALUE}};',
233	211	],
234	212	]
235	213	);
236	214
		@@ -236,9 +214,9 @@
236	214
237	215	$this->add_control(
238	216	'border_left-width',
239	217	[
240		- 'label' => esc_html__( 'Side Border Width', 'elementor' ),
	218	+ 'label' => esc_html__( 'Left Border Width', 'elementor' ),
241	219	'type' => Controls_Manager::SLIDER,
242	220	'size_units' => [ 'px', '%', 'em', 'rem', 'custom' ],
243	221	'range' => [
244	222	'px' => [
		@@ -248,9 +226,9 @@
248	226	'max' => 10,
249	227	],
250	228	],
251	229	'selectors' => [
252		- '{{WRAPPER}} .elementor-alert' => 'border-inline-start-width: {{SIZE}}{{UNIT}};',
	230	+ '{{WRAPPER}} .elementor-alert' => 'border-left-width: {{SIZE}}{{UNIT}};',
253	231	],
254	232	]
255	233	);
256	234
		@@ -475,45 +453,45 @@
475	453	*/
476	454	protected function render() {
477	455	$settings = $this->get_settings_for_display();
478	456
479		- if ( Utils::is_empty( $settings['alert_title'] ) && Utils::is_empty( $settings['alert_description'] ) ) {
	457	+ if ( Utils::is_empty( $settings['alert_title'] ) ) {
480	458	return;
481	459	}
482	460
483		- $this->add_render_attribute( 'alert_wrapper', 'class', 'elementor-alert' );
	461	+ if ( ! empty( $settings['alert_type'] ) ) {
	462	+ $this->add_render_attribute( 'wrapper', 'class', 'elementor-alert elementor-alert-' . $settings['alert_type'] );
	463	+ }
484	464
485		- $this->add_render_attribute( 'alert_wrapper', 'role', 'alert' );
	465	+ $this->add_render_attribute( 'wrapper', 'role', 'alert' );
486	466
487	467	$this->add_render_attribute( 'alert_title', 'class', 'elementor-alert-title' );
488	468
489		- $this->add_render_attribute( 'alert_description', 'class', 'elementor-alert-description' );
490		-
491	469	$this->add_inline_editing_attributes( 'alert_title', 'none' );
492		-
493		- $this->add_inline_editing_attributes( 'alert_description' );
494	470	?>
495		- <div <?php $this->print_render_attribute_string( 'alert_wrapper' ); ?>>
	471	+ <div <?php $this->print_render_attribute_string( 'wrapper' ); ?>>
	472	+ <span <?php $this->print_render_attribute_string( 'alert_title' ); ?>><?php $this->print_unescaped_setting( 'alert_title' ); ?></span>
	473	+ <?php
	474	+ if ( ! Utils::is_empty( $settings['alert_description'] ) ) :
	475	+ $this->add_render_attribute( 'alert_description', 'class', 'elementor-alert-description' );
496	476
497		- <?php if ( ! Utils::is_empty( $settings['alert_title'] ) ) : ?>
498		- <span <?php $this->print_render_attribute_string( 'alert_title' ); ?>><?php echo wp_kses_post( $settings['alert_title'] ); ?></span>
	477	+ $this->add_inline_editing_attributes( 'alert_description' );
	478	+ ?>
	479	+ <span <?php $this->print_render_attribute_string( 'alert_description' ); ?>><?php $this->print_unescaped_setting( 'alert_description' ); ?></span>
499	480	<?php endif; ?>
500		-
501		- <?php if ( ! Utils::is_empty( $settings['alert_description'] ) ) : ?>
502		- <span <?php $this->print_render_attribute_string( 'alert_description' ); ?>><?php echo wp_kses_post( $settings['alert_description'] ); ?></span>
503		- <?php endif; ?>
504		-
505	481	<?php if ( 'show' === $settings['show_dismiss'] ) : ?>
506		- <button type="button" class="elementor-alert-dismiss" aria-label="<?php echo esc_attr__( 'Dismiss this alert.', 'elementor' ); ?>">
507		- <?php
508		- if ( ! empty( $settings['dismiss_icon']['value'] ) ) {
509		- Icons_Manager::render_icon( $settings['dismiss_icon'], [ 'aria-hidden' => 'true' ] );
510		- } else { ?>
511		- <span aria-hidden="true">&times;</span>
512		- <?php } ?>
513		- </button>
	482	+ <button type="button" class="elementor-alert-dismiss">
	483	+ <?php
	484	+ if ( ! empty( $settings['dismiss_icon']['value'] ) ) {
	485	+ Icons_Manager::render_icon( $settings['dismiss_icon'], [
	486	+ 'aria-hidden' => 'true',
	487	+ ] );
	488	+ } else { ?>
	489	+ <span aria-hidden="true">&times;</span>
	490	+ <?php } ?>
	491	+ <span class="elementor-screen-only"><?php echo esc_html__( 'Dismiss this alert.', 'elementor' ); ?></span>
	492	+ </button>
514	493	<?php endif; ?>
515		-
516	494	</div>
517	495	<?php
518	496	}
519	497
		@@ -526,48 +504,34 @@
526	504	* @access protected
527	505	*/
528	506	protected function content_template() {
529	507	?>
530		- <#
531		- if ( ! settings.alert_title && ! settings.alert_description ) {
532		- return;
533		- }
	508	+ <# if ( settings.alert_title ) {
	509	+ view.addRenderAttribute( {
	510	+ alert_title: { class: 'elementor-alert-title' },
	511	+ alert_description: { class: 'elementor-alert-description' }
	512	+ } );
534	513
535		- view.addRenderAttribute( 'alert_wrapper', 'class', 'elementor-alert' );
	514	+ view.addInlineEditingAttributes( 'alert_title', 'none' );
	515	+ view.addInlineEditingAttributes( 'alert_description' );
536	516
537		- view.addRenderAttribute( 'alert_wrapper', 'role', 'alert' );
538		-
539		- view.addRenderAttribute( 'alert_title', 'class', 'elementor-alert-title' );
540		-
541		- view.addRenderAttribute( 'alert_description', 'class', 'elementor-alert-description' );
542		-
543		- view.addInlineEditingAttributes( 'alert_title', 'none' );
544		-
545		- view.addInlineEditingAttributes( 'alert_description' );
546		-
547		- var iconHTML = elementor.helpers.renderIcon( view, settings.dismiss_icon, { 'aria-hidden': true }, 'i' , 'object' ),
548		- migrated = elementor.helpers.isIconMigrated( settings, 'dismiss_icon' );
549		- #>
550		- <div {{{ view.getRenderAttributeString( 'alert_wrapper' ) }}}>
551		-
552		- <# if ( settings.alert_title ) { #>
553		- <span {{{ view.getRenderAttributeString( 'alert_title' ) }}}>{{ settings.alert_title }}</span>
554		- <# } #>
555		-
556		- <# if ( settings.alert_description ) { #>
557		- <span {{{ view.getRenderAttributeString( 'alert_description' ) }}}>{{ settings.alert_description }}</span>
558		- <# } #>
559		-
560		- <# if ( 'show' === settings.show_dismiss ) { #>
561		- <button type="button" class="elementor-alert-dismiss" aria-label="<?php echo esc_attr__( 'Dismiss this alert.', 'elementor' ); ?>">
562		- <# if ( iconHTML && iconHTML.rendered && ( ! settings.icon || migrated ) ) { #>
563		- {{{ iconHTML.value }}}
564		- <# } else { #>
565		- <span aria-hidden="true">&times;</span>
	517	+ var iconHTML = elementor.helpers.renderIcon( view, settings.dismiss_icon, { 'aria-hidden': true }, 'i' , 'object' ),
	518	+ migrated = elementor.helpers.isIconMigrated( settings, 'dismiss_icon' );
	519	+ #>
	520	+ <div class="elementor-alert elementor-alert-{{ settings.alert_type }}" role="alert">
	521	+ <span {{{ view.getRenderAttributeString( 'alert_title' ) }}}>{{{ settings.alert_title }}}</span>
	522	+ <span {{{ view.getRenderAttributeString( 'alert_description' ) }}}>{{{ settings.alert_description }}}</span>
	523	+ <# if ( 'show' === settings.show_dismiss ) { #>
	524	+ <button type="button" class="elementor-alert-dismiss">
	525	+ <# if ( iconHTML && iconHTML.rendered && ( ! settings.icon || migrated ) ) { #>
	526	+ {{{ iconHTML.value }}}
	527	+ <# } else { #>
	528	+ <span aria-hidden="true">&times;</span>
	529	+ <# } #>
	530	+ <span class="elementor-screen-only"><?php echo esc_html__( 'Dismiss this alert.', 'elementor' ); ?></span>
	531	+ </button>
566	532	<# } #>
567		- </button>
568		- <# } #>
569		-
570		- </div>
	533	+ </div>
	534	+ <# } #>
571	535	<?php
572	536	}
573	537	}