| @@ -13,11 +13,8 @@ | ||
| 13 | 13 | use Elementor\Utils; |
| 14 | 14 | use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager; |
| 15 | 15 | use Elementor\Core\Utils\Assets_Config_Provider; |
| 16 | 16 | use Elementor\Core\Utils\Collection; |
| 17 | -use Elementor\Core\Utils\Assets_Translation_Loader; | |
| 18 | -use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider; | |
| 19 | -use Elementor\App\AdminMenuItems\Editor_One_Theme_Builder_Menu; | |
| 20 | 17 | |
| 21 | 18 | use Elementor\App\Modules\ImportExport\Module as ImportExportModule; |
| 22 | 19 | use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule; |
| 23 | 20 | use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule; |
| @@ -49,10 +46,10 @@ | ||
| 49 | 46 | public function get_base_url() { |
| 50 | 47 | return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION ); |
| 51 | 48 | } |
| 52 | 49 | |
| 53 | - private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) { | |
| 54 | - $menu_data_provider->register_menu( new Editor_One_Theme_Builder_Menu() ); | |
| 50 | + private function register_admin_menu( Admin_Menu_Manager $admin_menu ) { | |
| 51 | + $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() ); | |
| 55 | 52 | } |
| 56 | 53 | |
| 57 | 54 | public function fix_submenu( $menu ) { |
| 58 | 55 | global $submenu; |
| @@ -117,9 +114,8 @@ | ||
| 117 | 114 | 'hasPro' => Utils::has_pro(), |
| 118 | 115 | 'admin_url' => admin_url(), |
| 119 | 116 | 'login_url' => wp_login_url(), |
| 120 | 117 | 'base_url' => $this->get_base_url(), |
| 121 | - 'home_url' => home_url(), | |
| 122 | 118 | 'promotion' => Filtered_Promotions_Manager::get_filtered_promotion_data( |
| 123 | 119 | [ 'upgrade_url' => 'https://go.elementor.com/go-pro-theme-builder/' ], |
| 124 | 120 | 'elementor/site-editor/promotion', |
| 125 | 121 | 'upgrade_url' |
| @@ -168,9 +164,9 @@ | ||
| 168 | 164 | ->set_path_resolver( function ( $name ) { |
| 169 | 165 | return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php"; |
| 170 | 166 | } ); |
| 171 | 167 | |
| 172 | - Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding' ] ) | |
| 168 | + Collection::make( [ 'ui', 'icons' ] ) | |
| 173 | 169 | ->each( function( $package ) use ( $assets_config_provider ) { |
| 174 | 170 | $suffix = Utils::is_script_debug() ? '' : '.min'; |
| 175 | 171 | $config = $assets_config_provider->load( $package )->get( $package ); |
| 176 | 172 | |
| @@ -255,9 +251,8 @@ | ||
| 255 | 251 | 'wp-url', |
| 256 | 252 | 'wp-i18n', |
| 257 | 253 | 'elementor-v2-ui', |
| 258 | 254 | 'elementor-v2-icons', |
| 259 | - 'elementor-v2-onboarding', | |
| 260 | 255 | 'react', |
| 261 | 256 | 'react-dom', |
| 262 | 257 | 'select2', |
| 263 | 258 | ], |
| @@ -266,9 +261,10 @@ | ||
| 266 | 261 | ); |
| 267 | 262 | |
| 268 | 263 | $this->enqueue_dark_theme_detection_script(); |
| 269 | 264 | |
| 270 | - Assets_Translation_Loader::for_handles( [ 'elementor-app-packages', 'elementor-app' ], 'elementor' ); | |
| 265 | + wp_set_script_translations( 'elementor-app-packages', 'elementor' ); | |
| 266 | + wp_set_script_translations( 'elementor-app', 'elementor' ); | |
| 271 | 267 | |
| 272 | 268 | $this->print_config(); |
| 273 | 269 | } |
| 274 | 270 | |
| @@ -289,13 +285,12 @@ | ||
| 289 | 285 | private function register_import_export_customization_experiment() { |
| 290 | 286 | Plugin::$instance->experiments->add_feature( [ |
| 291 | 287 | 'name' => 'import-export-customization', |
| 292 | 288 | 'title' => esc_html__( 'Import/Export Customization', 'elementor' ), |
| 293 | - 'description' => esc_html__( 'Enhanced import/export for website templates. Selectively include site content, templates, and settings with advanced granular control.', 'elementor' ), | |
| 294 | - 'release_status' => ExperimentsManager::RELEASE_STATUS_BETA, | |
| 295 | - 'default' => ExperimentsManager::STATE_ACTIVE, | |
| 289 | + 'description' => esc_html__( 'Enable advanced customization options for import/export functionality.', 'elementor' ), | |
| 296 | 290 | 'hidden' => true, |
| 297 | - 'mutable' => false, | |
| 291 | + 'release_status' => ExperimentsManager::RELEASE_STATUS_ALPHA, | |
| 292 | + 'default' => ExperimentsManager::STATE_INACTIVE, | |
| 298 | 293 | ] ); |
| 299 | 294 | } |
| 300 | 295 | |
| 301 | 296 | public function __construct() { |
| @@ -315,11 +310,11 @@ | ||
| 315 | 310 | } |
| 316 | 311 | |
| 317 | 312 | $this->add_component( 'onboarding', new OnboardingModule() ); |
| 318 | 313 | |
| 319 | - add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) { | |
| 320 | - $this->register_editor_one_menu( $menu_data_provider ); | |
| 321 | - } ); | |
| 314 | + add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) { | |
| 315 | + $this->register_admin_menu( $admin_menu ); | |
| 316 | + }, Source_Local::ADMIN_MENU_PRIORITY + 10 ); | |
| 322 | 317 | |
| 323 | 318 | // Happens after WP plugin page validation. |
| 324 | 319 | add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] ); |
| 325 | 320 | |
