| @@ -158,13 +158,8 @@ | ||
| 158 | 158 | */ |
| 159 | 159 | const CHOOSE = 'choose'; |
| 160 | 160 | |
| 161 | 161 | /** |
| 162 | - * Visual_Choice control. | |
| 163 | - */ | |
| 164 | - const VISUAL_CHOICE = 'visual_choice'; | |
| 165 | - | |
| 166 | - /** | |
| 167 | 162 | * WYSIWYG control. |
| 168 | 163 | */ |
| 169 | 164 | const WYSIWYG = 'wysiwyg'; |
| 170 | 165 | |
| @@ -425,9 +420,8 @@ | ||
| 425 | 420 | self::MEDIA, |
| 426 | 421 | self::SLIDER, |
| 427 | 422 | self::DIMENSIONS, |
| 428 | 423 | self::CHOOSE, |
| 429 | - self::VISUAL_CHOICE, | |
| 430 | 424 | self::WYSIWYG, |
| 431 | 425 | self::CODE, |
| 432 | 426 | self::FONT, |
| 433 | 427 | self::IMAGE_DIMENSIONS, |
| @@ -494,14 +488,14 @@ | ||
| 494 | 488 | * |
| 495 | 489 | * @param Controls_Manager $this The controls manager. |
| 496 | 490 | */ |
| 497 | 491 | // TODO: Uncomment when Pro uses the new hook. |
| 498 | - // Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->do_deprecated_action( | |
| 499 | - // 'elementor/controls/controls_registered', | |
| 500 | - // [ $this ], | |
| 501 | - // '3.5.0', | |
| 502 | - // 'elementor/controls/register' | |
| 503 | - // ); | |
| 492 | + //Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->do_deprecated_action( | |
| 493 | + // 'elementor/controls/controls_registered', | |
| 494 | + // [ $this ], | |
| 495 | + // '3.5.0', | |
| 496 | + // 'elementor/controls/register' | |
| 497 | + //); | |
| 504 | 498 | |
| 505 | 499 | do_action( 'elementor/controls/controls_registered', $this ); |
| 506 | 500 | |
| 507 | 501 | /** |
| @@ -531,13 +525,13 @@ | ||
| 531 | 525 | * current instance. |
| 532 | 526 | */ |
| 533 | 527 | public function register_control( $control_id, Base_Control $control_instance ) { |
| 534 | 528 | // TODO: Uncomment when Pro uses the new hook. |
| 535 | - // Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( | |
| 536 | - // __METHOD__, | |
| 537 | - // '3.5.0', | |
| 538 | - // 'register()' | |
| 539 | - // ); | |
| 529 | + //Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( | |
| 530 | + // __METHOD__, | |
| 531 | + // '3.5.0', | |
| 532 | + // 'register()' | |
| 533 | + //); | |
| 540 | 534 | |
| 541 | 535 | $this->register( $control_instance, $control_id ); |
| 542 | 536 | } |
| 543 | 537 | |
| @@ -807,9 +801,13 @@ | ||
| 807 | 801 | 'index' => null, |
| 808 | 802 | ]; |
| 809 | 803 | |
| 810 | 804 | $control_type = 'controls'; |
| 811 | - if ( Performance::should_optimize_controls() && $this->is_style_control( $control_data ) ) { | |
| 805 | + if ( | |
| 806 | + Performance::is_optimized_control_loading_feature_enabled() | |
| 807 | + && Performance::should_optimize_controls() | |
| 808 | + && $this->is_style_control( $control_data ) | |
| 809 | + ) { | |
| 812 | 810 | $control_type = 'style_controls'; |
| 813 | 811 | } |
| 814 | 812 | |
| 815 | 813 | $options = array_merge( $default_options, $options ); |
| @@ -887,9 +885,9 @@ | ||
| 887 | 885 | * |
| 888 | 886 | * @since 1.0.0 |
| 889 | 887 | * @access public |
| 890 | 888 | * |
| 891 | - * @param string $stack_id Stack ID. | |
| 889 | + * @param string $stack_id Stack ID. | |
| 892 | 890 | * @param array|string $control_id The ID of the control to remove. |
| 893 | 891 | * |
| 894 | 892 | * @return bool|\WP_Error True if the stack was removed, False otherwise. |
| 895 | 893 | */ |
| @@ -912,9 +910,8 @@ | ||
| 912 | 910 | } |
| 913 | 911 | |
| 914 | 912 | /** |
| 915 | 913 | * Has Stacks Cache Been Cleared. |
| 916 | - * | |
| 917 | 914 | * @since 3.13.0 |
| 918 | 915 | * @access public |
| 919 | 916 | * @return bool True if the CSS requires to clear the controls stack cache, False otherwise. |
| 920 | 917 | */ |
| @@ -924,9 +921,8 @@ | ||
| 924 | 921 | |
| 925 | 922 | /** |
| 926 | 923 | * Clear stack. |
| 927 | 924 | * This method clears the stack. |
| 928 | - * | |
| 929 | 925 | * @since 3.13.0 |
| 930 | 926 | * @access public |
| 931 | 927 | */ |
| 932 | 928 | public function clear_stack_cache() { |
| @@ -1064,10 +1060,11 @@ | ||
| 1064 | 1060 | * @since 1.0.0 |
| 1065 | 1061 | * @access public |
| 1066 | 1062 | * |
| 1067 | 1063 | * @param Controls_Stack $controls_stack . |
| 1068 | - * @param string $tab | |
| 1069 | - * @param array $additional_messages | |
| 1064 | + * @param string $tab | |
| 1065 | + * @param array $additional_messages | |
| 1066 | + * | |
| 1070 | 1067 | */ |
| 1071 | 1068 | public function add_custom_css_controls( Controls_Stack $controls_stack, $tab = self::TAB_ADVANCED, $additional_messages = [] ) { |
| 1072 | 1069 | $controls_stack->start_controls_section( |
| 1073 | 1070 | 'section_custom_css_pro', |
| @@ -1107,10 +1104,10 @@ | ||
| 1107 | 1104 | * version of elementor uses this method to display an upgrade message to |
| 1108 | 1105 | * Elementor Pro. |
| 1109 | 1106 | * |
| 1110 | 1107 | * @param Controls_Stack $controls_stack . |
| 1111 | - * @param string $tab | |
| 1112 | - * @param array $additional_messages | |
| 1108 | + * @param string $tab | |
| 1109 | + * @param array $additional_messages | |
| 1113 | 1110 | * |
| 1114 | 1111 | * @return void |
| 1115 | 1112 | */ |
| 1116 | 1113 | public function add_page_transitions_controls( Controls_Stack $controls_stack, $tab = self::TAB_ADVANCED, $additional_messages = [] ) { |
| @@ -1191,12 +1188,12 @@ | ||
| 1191 | 1188 | * This method adds a new control for the "Custom Attributes" feature. The free |
| 1192 | 1189 | * version of elementor uses this method to display an upgrade message to |
| 1193 | 1190 | * Elementor Pro. |
| 1194 | 1191 | * |
| 1195 | - * @param Controls_Stack $controls_stack . | |
| 1196 | - * @param string $tab | |
| 1197 | 1192 | * @since 2.8.3 |
| 1198 | 1193 | * @access public |
| 1194 | + * | |
| 1195 | + * @param Controls_Stack $controls_stack. | |
| 1199 | 1196 | */ |
| 1200 | 1197 | public function add_custom_attributes_controls( Controls_Stack $controls_stack, string $tab = self::TAB_ADVANCED ) { |
| 1201 | 1198 | $controls_stack->start_controls_section( |
| 1202 | 1199 | 'section_custom_attributes_pro', |
| @@ -1225,9 +1222,9 @@ | ||
| 1225 | 1222 | |
| 1226 | 1223 | /** |
| 1227 | 1224 | * Check if a stack should be cleaned by the current responsive control duplication mode. |
| 1228 | 1225 | * |
| 1229 | - * @param array $stack | |
| 1226 | + * @param $stack | |
| 1230 | 1227 | * @return bool |
| 1231 | 1228 | */ |
| 1232 | 1229 | private function should_clean_stack( $stack ): bool { |
| 1233 | 1230 | if ( ! isset( $stack['responsive_control_duplication_mode'] ) ) { |
| @@ -1269,9 +1266,9 @@ | ||
| 1269 | 1266 | <span class="e-control-display-conditions-promotion__text"> |
| 1270 | 1267 | <?php echo esc_html__( 'Display Conditions', 'elementor' ); ?> |
| 1271 | 1268 | </span> |
| 1272 | 1269 | <span class="e-control-display-conditions-promotion__lock-wrapper"> |
| 1273 | - <i class="eicon-upgrade-crown-full e-control-display-conditions-promotion"></i> | |
| 1270 | + <i class="eicon-lock e-control-display-conditions-promotion"></i> | |
| 1274 | 1271 | </span> |
| 1275 | 1272 | </div> |
| 1276 | 1273 | <i class="eicon-flow e-control-display-conditions-promotion"></i> |
| 1277 | 1274 | </div> |
| @@ -1335,9 +1332,9 @@ | ||
| 1335 | 1332 | <label> |
| 1336 | 1333 | ' . $title . ' |
| 1337 | 1334 | </label> |
| 1338 | 1335 | <span class="e-control-motion-effects-promotion__lock-wrapper"> |
| 1339 | - <i class="eicon-upgrade-crown-full"></i> | |
| 1336 | + <i class="eicon-lock"></i> | |
| 1340 | 1337 | </span> |
| 1341 | 1338 | <div class="elementor-control-input-wrapper"> |
| 1342 | 1339 | <label class="elementor-switch elementor-control-unit-2 e-control-' . $id . '-promotion"> |
| 1343 | 1340 | <input type="checkbox" class="elementor-switch-input" disabled> |
| @@ -1357,12 +1354,12 @@ | ||
| 1357 | 1354 | <label for="sticky-motion-effect-pro"> |
| 1358 | 1355 | ' . $title . ' |
| 1359 | 1356 | </label> |
| 1360 | 1357 | <span class="e-control-motion-effects-promotion__lock-wrapper"> |
| 1361 | - <i class="eicon-upgrade-crown-full"></i> | |
| 1358 | + <i class="eicon-lock"></i> | |
| 1362 | 1359 | </span> |
| 1363 | 1360 | <div class="elementor-control-input-wrapper elementor-control-unit-5 e-control-' . $id . '-promotion"> |
| 1364 | - <div class="select-promotion elementor-control-unit-5">' . esc_html__( 'None', 'elementor' ) . '</div> | |
| 1361 | + <div class="select-promotion elementor-control-unit-5">None</div> | |
| 1365 | 1362 | </div> |
| 1366 | 1363 | </div> |
| 1367 | 1364 | </div> |
| 1368 | 1365 | </div>'; |