| @@ -2,12 +2,9 @@ | ||
| 2 | 2 | namespace Elementor\Modules\ElementManager; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Core\Base\Module as BaseModule; |
| 5 | 5 | use Elementor\Core\Admin\Menu\Admin_Menu_Manager; |
| 6 | -use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider; | |
| 7 | -use Elementor\Modules\ElementManager\AdminMenuItems\Editor_One_Elements_Manager_Menu; | |
| 8 | 6 | use Elementor\Widget_Base; |
| 9 | -use Elementor\Plugin; | |
| 10 | 7 | |
| 11 | 8 | if ( ! defined( 'ABSPATH' ) ) { |
| 12 | 9 | exit; // Exit if accessed directly. |
| 13 | 10 | } |
| @@ -25,15 +22,18 @@ | ||
| 25 | 22 | |
| 26 | 23 | $ajax = new Ajax(); |
| 27 | 24 | $ajax->register_endpoints(); |
| 28 | 25 | |
| 29 | - add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) { | |
| 30 | - $this->register_editor_one_menu( $menu_data_provider ); | |
| 31 | - } ); | |
| 26 | + add_action( 'elementor/admin/menu/register', function( Admin_Menu_Manager $admin_menu ) { | |
| 27 | + $admin_menu->register( static::PAGE_ID, new Admin_Menu_App() ); | |
| 28 | + }, 25 ); | |
| 32 | 29 | |
| 33 | - add_action( 'elementor/editor-one/menu/after_register_hidden_submenus', function ( array $hooks ) { | |
| 34 | - $this->enqueue_assets_for_editor_one_menu( $hooks ); | |
| 35 | - } ); | |
| 30 | + add_action( 'elementor/admin/menu/after_register', function ( Admin_Menu_Manager $admin_menu, array $hooks ) { | |
| 31 | + if ( ! empty( $hooks[ static::PAGE_ID ] ) ) { | |
| 32 | + add_action( "admin_print_scripts-{$hooks[ static::PAGE_ID ]}", [ $this, 'enqueue_assets' ] ); | |
| 33 | + add_action( "admin_footer-{$hooks[ static::PAGE_ID ]}", [ $this, 'print_styles' ], 1000 ); | |
| 34 | + } | |
| 35 | + }, 10, 2 ); | |
| 36 | 36 | |
| 37 | 37 | add_filter( 'elementor/widgets/is_widget_enabled', function( $should_register, Widget_Base $widget_instance ) { |
| 38 | 38 | return ! Options::is_element_disabled( $widget_instance->get_name() ); |
| 39 | 39 | }, 10, 2 ); |
| @@ -58,19 +58,8 @@ | ||
| 58 | 58 | return $params; |
| 59 | 59 | } ); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function enqueue_assets_for_editor_one_menu( array $hooks ): void { | |
| 63 | - if ( ! empty( $hooks[ static::PAGE_ID ] ) ) { | |
| 64 | - add_action( "admin_print_scripts-{$hooks[ static::PAGE_ID ]}", [ $this, 'enqueue_assets' ] ); | |
| 65 | - add_action( "admin_footer-{$hooks[ static::PAGE_ID ]}", [ $this, 'print_styles' ], 1000 ); | |
| 66 | - } | |
| 67 | - } | |
| 68 | - | |
| 69 | - private function register_editor_one_menu( Menu_Data_Provider $menu_data_provider ): void { | |
| 70 | - $menu_data_provider->register_menu( new Editor_One_Elements_Manager_Menu() ); | |
| 71 | - } | |
| 72 | - | |
| 73 | 62 | public function enqueue_assets() { |
| 74 | 63 | wp_enqueue_script( |
| 75 | 64 | 'e-element-manager-app', |
| 76 | 65 | $this->get_js_assets_url( 'element-manager-admin' ), |
| @@ -78,10 +67,8 @@ | ||
| 78 | 67 | 'wp-element', |
| 79 | 68 | 'wp-components', |
| 80 | 69 | 'wp-dom-ready', |
| 81 | 70 | 'wp-i18n', |
| 82 | - 'elementor-v2-ui', | |
| 83 | - 'elementor-v2-icons', | |
| 84 | 71 | ], |
| 85 | 72 | ELEMENTOR_VERSION |
| 86 | 73 | ); |
| 87 | 74 | |