| @@ -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; |
| @@ -22,9 +19,8 @@ | ||
| 22 | 19 | use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule; |
| 23 | 20 | use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule; |
| 24 | 21 | use Elementor\App\Modules\SiteEditor\Module as SiteEditorModule; |
| 25 | 22 | use Elementor\App\Modules\Onboarding\Module as OnboardingModule; |
| 26 | -use Elementor\App\Modules\SiteBuilder\Module as SiteBuilderModule; | |
| 27 | 23 | |
| 28 | 24 | if ( ! defined( 'ABSPATH' ) ) { |
| 29 | 25 | exit; // Exit if accessed directly. |
| 30 | 26 | } |
| @@ -50,10 +46,10 @@ | ||
| 50 | 46 | public function get_base_url() { |
| 51 | 47 | return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION ); |
| 52 | 48 | } |
| 53 | 49 | |
| 54 | - private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ) { | |
| 55 | - $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() ); | |
| 56 | 52 | } |
| 57 | 53 | |
| 58 | 54 | public function fix_submenu( $menu ) { |
| 59 | 55 | global $submenu; |
| @@ -169,9 +165,9 @@ | ||
| 169 | 165 | ->set_path_resolver( function ( $name ) { |
| 170 | 166 | return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php"; |
| 171 | 167 | } ); |
| 172 | 168 | |
| 173 | - Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding', 'site-builder' ] ) | |
| 169 | + Collection::make( [ 'ui', 'icons' ] ) | |
| 174 | 170 | ->each( function( $package ) use ( $assets_config_provider ) { |
| 175 | 171 | $suffix = Utils::is_script_debug() ? '' : '.min'; |
| 176 | 172 | $config = $assets_config_provider->load( $package )->get( $package ); |
| 177 | 173 | |
| @@ -256,10 +252,8 @@ | ||
| 256 | 252 | 'wp-url', |
| 257 | 253 | 'wp-i18n', |
| 258 | 254 | 'elementor-v2-ui', |
| 259 | 255 | 'elementor-v2-icons', |
| 260 | - 'elementor-v2-onboarding', | |
| 261 | - 'elementor-v2-site-builder', | |
| 262 | 256 | 'react', |
| 263 | 257 | 'react-dom', |
| 264 | 258 | 'select2', |
| 265 | 259 | ], |
| @@ -268,9 +262,10 @@ | ||
| 268 | 262 | ); |
| 269 | 263 | |
| 270 | 264 | $this->enqueue_dark_theme_detection_script(); |
| 271 | 265 | |
| 272 | - Assets_Translation_Loader::for_handles( [ 'elementor-app-packages', 'elementor-app' ], 'elementor' ); | |
| 266 | + wp_set_script_translations( 'elementor-app-packages', 'elementor' ); | |
| 267 | + wp_set_script_translations( 'elementor-app', 'elementor' ); | |
| 273 | 268 | |
| 274 | 269 | $this->print_config(); |
| 275 | 270 | } |
| 276 | 271 | |
| @@ -294,10 +289,8 @@ | ||
| 294 | 289 | 'title' => esc_html__( 'Import/Export Customization', 'elementor' ), |
| 295 | 290 | 'description' => esc_html__( 'Enhanced import/export for website templates. Selectively include site content, templates, and settings with advanced granular control.', 'elementor' ), |
| 296 | 291 | 'release_status' => ExperimentsManager::RELEASE_STATUS_BETA, |
| 297 | 292 | 'default' => ExperimentsManager::STATE_ACTIVE, |
| 298 | - 'hidden' => true, | |
| 299 | - 'mutable' => false, | |
| 300 | 293 | ] ); |
| 301 | 294 | } |
| 302 | 295 | |
| 303 | 296 | public function __construct() { |
| @@ -303,9 +296,8 @@ | ||
| 303 | 296 | public function __construct() { |
| 304 | 297 | $this->register_import_export_customization_experiment(); |
| 305 | 298 | |
| 306 | 299 | $this->add_component( 'site-editor', new SiteEditorModule() ); |
| 307 | - $this->add_component( 'site-builder', new SiteBuilderModule() ); | |
| 308 | 300 | |
| 309 | 301 | if ( current_user_can( 'manage_options' ) || Utils::is_wp_cli() ) { |
| 310 | 302 | $this->add_component( 'import-export', new ImportExportModule() ); |
| 311 | 303 | |
| @@ -318,11 +310,11 @@ | ||
| 318 | 310 | } |
| 319 | 311 | |
| 320 | 312 | $this->add_component( 'onboarding', new OnboardingModule() ); |
| 321 | 313 | |
| 322 | - add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) { | |
| 323 | - $this->register_editor_one_menu( $menu_data_provider ); | |
| 324 | - } ); | |
| 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 ); | |
| 325 | 317 | |
| 326 | 318 | // Happens after WP plugin page validation. |
| 327 | 319 | add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] ); |
| 328 | 320 | |
