| @@ -14,10 +14,8 @@ | ||
| 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 | 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 | 18 | |
| 21 | 19 | use Elementor\App\Modules\ImportExport\Module as ImportExportModule; |
| 22 | 20 | use Elementor\App\Modules\KitLibrary\Module as KitLibraryModule; |
| 23 | 21 | use Elementor\App\Modules\ImportExportCustomization\Module as ImportExportCustomizationModule; |
| @@ -49,10 +47,10 @@ | ||
| 49 | 47 | public function get_base_url() { |
| 50 | 48 | return admin_url( 'admin.php?page=' . self::PAGE_ID . '&ver=' . ELEMENTOR_VERSION ); |
| 51 | 49 | } |
| 52 | 50 | |
| 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() ); | |
| 51 | + private function register_admin_menu( Admin_Menu_Manager $admin_menu ) { | |
| 52 | + $admin_menu->register( static::PAGE_ID, new Theme_Builder_Menu_Item() ); | |
| 55 | 53 | } |
| 56 | 54 | |
| 57 | 55 | public function fix_submenu( $menu ) { |
| 58 | 56 | global $submenu; |
| @@ -168,9 +166,9 @@ | ||
| 168 | 166 | ->set_path_resolver( function ( $name ) { |
| 169 | 167 | return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php"; |
| 170 | 168 | } ); |
| 171 | 169 | |
| 172 | - Collection::make( [ 'ui', 'icons', 'store', 'query', 'utils', 'events', 'onboarding', 'schema' ] ) | |
| 170 | + Collection::make( [ 'ui', 'icons' ] ) | |
| 173 | 171 | ->each( function( $package ) use ( $assets_config_provider ) { |
| 174 | 172 | $suffix = Utils::is_script_debug() ? '' : '.min'; |
| 175 | 173 | $config = $assets_config_provider->load( $package )->get( $package ); |
| 176 | 174 | |
| @@ -255,9 +253,8 @@ | ||
| 255 | 253 | 'wp-url', |
| 256 | 254 | 'wp-i18n', |
| 257 | 255 | 'elementor-v2-ui', |
| 258 | 256 | 'elementor-v2-icons', |
| 259 | - 'elementor-v2-onboarding', | |
| 260 | 257 | 'react', |
| 261 | 258 | 'react-dom', |
| 262 | 259 | 'select2', |
| 263 | 260 | ], |
| @@ -315,11 +312,11 @@ | ||
| 315 | 312 | } |
| 316 | 313 | |
| 317 | 314 | $this->add_component( 'onboarding', new OnboardingModule() ); |
| 318 | 315 | |
| 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 | - } ); | |
| 316 | + add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) { | |
| 317 | + $this->register_admin_menu( $admin_menu ); | |
| 318 | + }, Source_Local::ADMIN_MENU_PRIORITY + 10 ); | |
| 322 | 319 | |
| 323 | 320 | // Happens after WP plugin page validation. |
| 324 | 321 | add_filter( 'add_menu_classes', [ $this, 'fix_submenu' ] ); |
| 325 | 322 | |
