← All changes | includes/controls/icons.php +23 -75 4.2.2 → 3.5.0-dev9 View file →

		@@ -72,20 +72,18 @@
72	72	public function render_media_skin() {
73	73	?>
74	74	<div class="elementor-control-field elementor-control-media">
75	75	<label class="elementor-control-title">{{{ data.label }}}</label>
76		- <div class="elementor-control-input-wrapper">
77		- <div class="elementor-control-media__content elementor-control-tag-area elementor-control-preview-area">
78		- <div class="elementor-control-media-upload-button elementor-control-media__content__upload-button">
	76	+ <div class="elementor-control-input-wrapper elementor-aspect-ratio-219">
	77	+ <div class="elementor-control-media__content elementor-control-tag-area elementor-control-preview-area elementor-fit-aspect-ratio">
	78	+ <div class="elementor-control-media-upload-button elementor-control-media__content__upload-button elementor-fit-aspect-ratio">
79	79	<i class="eicon-plus-circle" aria-hidden="true"></i>
80		- <span class="elementor-screen-only"><?php echo esc_html__( 'Add', 'elementor' ); ?></span>
81	80	</div>
82		- <div class="elementor-control-media-area">
83		- <div class="elementor-control-media__remove elementor-control-media__content__remove" data-tooltip="<?php echo esc_attr__( 'Remove', 'elementor' ); ?>">
84		- <i class="eicon-trash-o" aria-hidden="true"></i>
85		- <span class="elementor-screen-only"><?php echo esc_html__( 'Remove', 'elementor' ); ?></span>
	81	+ <div class="elementor-control-media-area elementor-fit-aspect-ratio">
	82	+ <div class="elementor-control-media__remove elementor-control-media__content__remove" title="<?php echo esc_html__( 'Remove', 'elementor' ); ?>">
	83	+ <i class="eicon-trash-o"></i>
86	84	</div>
87		- <div class="elementor-control-media__preview"></div>
	85	+ <div class="elementor-control-media__preview elementor-fit-aspect-ratio"></div>
88	86	</div>
89	87	<div class="elementor-control-media__tools elementor-control-dynamic-switcher-wrapper">
90	88	<div class="elementor-control-icon-picker elementor-control-media__tool"><?php echo esc_html__( 'Icon Library', 'elementor' ); ?></div>
91	89	<div class="elementor-control-svg-uploader elementor-control-media__tool"><?php echo esc_html__( 'Upload SVG', 'elementor' ); ?></div>
		@@ -101,59 +99,31 @@
101	99	}
102	100
103	101	public function render_inline_skin() {
104	102	?>
105		- <#
106		- const defaultSkinSettings = {
107		- none: {
108		- label: '<?php echo esc_html__( 'None', 'elementor' ); ?>',
109		- icon: 'eicon-ban',
110		- },
111		- svg: {
112		- label: '<?php echo esc_html__( 'Upload SVG', 'elementor' ); ?>',
113		- icon: 'eicon-upload',
114		- },
115		- icon: {
116		- label: '<?php echo esc_html__( 'Icon Library', 'elementor' ); ?>',
117		- icon: 'eicon-circle',
118		- }
119		- };
120		-
121		- const skinSettings = data.skin_settings.inline;
122		-
123		- const get = ( type, key ) => {
124		- if ( skinSettings[ type ] ) {
125		- return skinSettings[ type ]?.[ key ] || defaultSkinSettings[ type ][ key ];
126		- }
127		-
128		- return defaultSkinSettings[ type ][ key ];
129		- }
130		- #>
131	103	<div class="elementor-control-field elementor-control-inline-icon">
132	104	<label class="elementor-control-title">{{{ data.label }}}</label>
133	105	<div class="elementor-control-input-wrapper">
134	106	<div class="elementor-choices">
135		- <# if ( ! data.exclude_inline_options.includes( 'none' ) ) { #>
136		- <input id="<?php $this->print_control_uid(); ?>-none" type="radio" value="none">
137		- <label class="elementor-choices-label elementor-control-unit-1 tooltip-target elementor-control-icons--inline__none" for="<?php $this->print_control_uid(); ?>-none" data-tooltip="{{ get( 'none', 'label' ) }}">
138		- <i class="{{ get( 'none', 'icon' ) }}" aria-hidden="true"></i>
139		- <span class="elementor-screen-only">{{ get( 'none', 'label' ) }}</span>
140		- </label>
141		- <# }
142		- if ( ! data.exclude_inline_options.includes( 'svg' ) ) { #>
	107	+ <input id="<?php $this->print_control_uid(); ?>-none" type="radio" value="none">
	108	+ <label class="elementor-choices-label elementor-control-unit-1 tooltip-target elementor-control-icons--inline__none" for="<?php $this->print_control_uid(); ?>-none" data-tooltip="<?php echo esc_html__( 'None', 'elementor' ); ?>" title="<?php echo esc_html__( 'None', 'elementor' ); ?>">
	109	+ <i class="eicon-ban" aria-hidden="true"></i>
	110	+ <span class="elementor-screen-only"><?php echo esc_html__( 'None', 'elementor' ); ?></span>
	111	+ </label>
	112	+ <# if ( ! data.exclude_inline_options.includes( 'svg' ) ) { #>
143	113	<input id="<?php $this->print_control_uid(); ?>-svg" type="radio" value="svg">
144		- <label class="elementor-choices-label elementor-control-unit-1 tooltip-target elementor-control-icons--inline__svg" for="<?php $this->print_control_uid(); ?>-svg" data-tooltip="{{ get( 'svg', 'label' ) }}">
145		- <i class="{{ get( 'svg', 'icon' ) }}" aria-hidden="true"></i>
146		- <span class="elementor-screen-only">{{ get( 'svg', 'label' ) }}</span>
	114	+ <label class="elementor-choices-label elementor-control-unit-1 tooltip-target elementor-control-icons--inline__svg" for="<?php $this->print_control_uid(); ?>-svg" data-tooltip="<?php echo esc_html__( 'Upload SVG', 'elementor' ); ?>" title="<?php echo esc_html__( 'Upload SVG', 'elementor' ); ?>">
	115	+ <i class="eicon-upload" aria-hidden="true"></i>
	116	+ <span class="elementor-screen-only"><?php echo esc_html__( 'Upload SVG', 'elementor' ); ?></span>
147	117	</label>
148	118	<# }
149	119	if ( ! data.exclude_inline_options.includes( 'icon' ) ) { #>
150	120	<input id="<?php $this->print_control_uid(); ?>-icon" type="radio" value="icon">
151		- <label class="elementor-choices-label elementor-control-unit-1 tooltip-target elementor-control-icons--inline__icon" for="<?php $this->print_control_uid(); ?>-icon" data-tooltip="{{ get( 'icon', 'label' ) }}">
	121	+ <label class="elementor-choices-label elementor-control-unit-1 tooltip-target elementor-control-icons--inline__icon" for="<?php $this->print_control_uid(); ?>-icon" data-tooltip="<?php echo esc_html__( 'Icon Library', 'elementor' ); ?>" title="<?php echo esc_html__( 'Icon Library', 'elementor' ); ?>">
152	122	<span class="elementor-control-icons--inline__displayed-icon">
153		- <i class="{{ get( 'icon', 'icon' ) }}" aria-hidden="true"></i>
	123	+ <i class="eicon-circle" aria-hidden="true"></i>
154	124	</span>
155		- <span class="elementor-screen-only">{{ get( 'icon', 'label' ) }}</span>
	125	+ <span class="elementor-screen-only"><?php echo esc_html__( 'Icon Library', 'elementor' ); ?></span>
156	126	</label>
157	127	<# } #>
158	128	</div>
159	129	</div>
		@@ -186,38 +156,12 @@
186	156	'search_bar' => true,
187	157	'recommended' => false,
188	158	'skin' => 'media',
189	159	'exclude_inline_options' => [],
190		- 'disable_initial_active_state' => false,
191		- 'skin_settings' => [
192		- 'inline' => [
193		- 'none' => [
194		- 'label' => esc_html__( 'None', 'elementor' ),
195		- 'icon' => 'eicon-ban',
196		- ],
197		- 'svg' => [
198		- 'label' => esc_html__( 'Upload SVG', 'elementor' ),
199		- 'icon' => 'eicon-upload',
200		- ],
201		- 'icon' => [
202		- 'label' => esc_html__( 'Icon Library', 'elementor' ),
203		- 'icon' => 'eicon-circle',
204		- ],
205		- ],
206		- ],
207	160	];
208	161	}
209	162
210		- /**
211		- * Support SVG Import
212		- *
213		- * @param array $mimes
214		- * @return array
215		- * @deprecated 3.5.0
216		- */
217	163	public function support_svg_import( $mimes ) {
218		- Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.5.0' );
219		-
220	164	$mimes['svg'] = 'image/svg+xml';
221	165	return $mimes;
222	166	}
223	167
		@@ -225,9 +169,13 @@
225	169	if ( empty( $settings['library'] ) || 'svg' !== $settings['library'] || empty( $settings['value']['url'] ) ) {
226	170	return $settings;
227	171	}
228	172
	173	+ add_filter( 'upload_mimes', [ $this, 'support_svg_import' ], 100 );
	174	+
229	175	$imported = Plugin::$instance->templates_manager->get_import_images_instance()->import( $settings['value'] );
	176	+
	177	+ remove_filter( 'upload_mimes', [ $this, 'support_svg_import' ], 100 );
230	178
231	179	if ( ! $imported ) {
232	180	$settings['value'] = '';
233	181	$settings['library'] = '';