Merge branch 'release/3.0.0' of github.com:elementor/elementor into f…

…eature/global-style * 'release/3.0.0' of github.com:elementor/elementor: Fixed the way repeater control is detected. It fixes elementor#11578 Rename unfiltered files upload option name Removing unnecessary value in gradient. Changing mouse cursor to pointer on file selection box. Changing widgets search input X color in dark mode. Fixing dark mode color. Fixing Media control dark mode colors.
kobizz · Jun 10, 2020 · 1355b65 · 1355b65
2 parents b4d693e + aa9986a
commit 1355b65
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/assets/dev/js/editor/elements/models/base-settings.js b/assets/dev/js/editor/elements/models/base-settings.js
@@ -235,7 +235,7 @@ BaseSettingsModel = Backbone.Model.extend( {
 			var control = this,
 				valueToParse;
 
-			if ( 'repeater' === control.type ) {
+			if ( control.is_repeater ) {
 				valueToParse = settings[ control.name ];
 				valueToParse.forEach( function( value, key ) {
 					valueToParse[ key ] = self.parseDynamicSettings( value, options, control.fields );

diff --git a/assets/dev/js/editor/utils/helpers.js b/assets/dev/js/editor/utils/helpers.js
@@ -340,7 +340,7 @@ module.exports = {
 						has = true;
 						return false;
 					}
-					if ( 'repeater' === controlData.type ) {
+					if ( controlData.is_repeater ) {
 						has = hasControlOfType( controlData.fields, type );
 						if ( has ) {
 							return false;

diff --git a/assets/dev/scss/direction/editor-dark-mode.scss b/assets/dev/scss/direction/editor-dark-mode.scss
@@ -212,6 +212,15 @@ select {
 				color: $theme-dark-light;
 			}
 		}
+
+		&::-webkit-search-cancel-button {
+			-webkit-appearance: none;
+			height: 8px;
+			width: 8px;
+			background:
+					linear-gradient(45deg, transparent 45%, $theme-dark-gray-lightest 45%, $theme-dark-gray-lightest 55%, transparent 55%),
+					linear-gradient(135deg, transparent 45%, $theme-dark-gray-lightest 45%, $theme-dark-gray-lightest 55%, transparent 55%);
+		}
 	}
 
 	.elementor-element {
@@ -402,13 +411,8 @@ $devices: 'desktop', 'tablet', 'mobile';
 }
 
 //Media Control
-.elementor-control-media-upload-button {
-	background-color: $theme-dark-gray-darkest;
-}
-
 .elementor-control-media__remove {
-	background-color: $theme-dark-gray-light;
-	color: $theme-dark-gray-lightest;
+	border-color: $theme-dark-gray-light;
 }
 
 .elementor-control-media {
@@ -429,6 +433,7 @@ $devices: 'desktop', 'tablet', 'mobile';
 
 		&,
 		&__controls {
+			background-color: $theme-dark-gray-darkest;
 			border-color: $theme-dark-gray-light;
 		}
 	}

diff --git a/assets/dev/scss/editor/panel/controls/_media.scss b/assets/dev/scss/editor/panel/controls/_media.scss
@@ -153,6 +153,8 @@
 		width: 100%;
 		margin-top: 10px;
 		border: 1px solid $editor-lightest;
+		border-radius: 3px;
+		cursor: pointer;
 
 		&__content {
 			@include padding-start(5px);

diff --git a/includes/base/controls-stack.php b/includes/base/controls-stack.php
@@ -1124,7 +1124,7 @@ public function parse_dynamic_settings( $settings, $controls = null, $all_settin
 				continue;
 			}
 
-			if ( 'repeater' === $control_obj->get_type() ) {
+			if ( $control_obj instanceof Control_Repeater ) {
 				foreach ( $settings[ $control_name ] as & $field ) {
 					$field = $this->parse_dynamic_settings( $field, $control['fields'], $field );
 				}
@@ -1990,7 +1990,9 @@ private function sanitize_settings( array $settings, array $controls = [] ) {
 		}
 
 		foreach ( $controls as $control ) {
-			if ( 'repeater' === $control['type'] ) {
+			$control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] );
+
+			if ( $control_obj instanceof Control_Repeater ) {
 				if ( empty( $settings[ $control['name'] ] ) ) {
 					continue;
 				}

diff --git a/includes/settings/settings.php b/includes/settings/settings.php
@@ -529,7 +529,7 @@ protected function create_tabs() {
 									'desc' => __( 'For troubleshooting server configuration conflicts.', 'elementor' ),
 								],
 							],
-							'enable_unfiltered_files_upload' => [
+							'unfiltered_files_upload' => [
 								'label' => __( 'Enable Unfiltered Files Uploads', 'elementor' ),
 								'field_args' => [
 									'type' => 'select',