← All changes | modules/atomic-opt-in/welcome-screen.php +14 -28 4.2.0-beta1 → 3.35.8 View file →

		@@ -3,16 +3,12 @@
3	3	namespace Elementor\Modules\AtomicOptIn;
4	4
5	5	use Elementor\Core\Isolation\Elementor_Adapter;
6	6	use Elementor\Core\Isolation\Elementor_Adapter_Interface;
7		-use Elementor\Core\Utils\Assets_Config_Provider;
8	7	use Elementor\Modules\ElementorCounter\Module as Elementor_Counter;
9		-use Elementor\Core\Upgrade\Manager as Upgrade_Manager;
10	8	use Elementor\Utils;
11	9
12	10	class WelcomeScreen {
13		- const PACKAGE_NAME = 'v4-activation-modal';
14		-
15	11	private Elementor_Adapter_Interface $elementor_adapter;
16	12
17	13	public function __construct() {
18	14	$this->elementor_adapter = new Elementor_Adapter();
		@@ -30,15 +26,9 @@
30	26	if ( $this->has_welcome_popover_been_displayed() ) {
31	27	return;
32	28	}
33	29
34		- if ( Upgrade_Manager::is_new_installation() ) {
35		- return;
36		- }
37		-
38		- $this->register_package();
39		- wp_enqueue_script( 'elementor-v2-' . self::PACKAGE_NAME );
40		- wp_set_script_translations( 'elementor-v2-' . self::PACKAGE_NAME, 'elementor' );
	30	+ $this->enqueue_scripts();
41	31	$this->set_welcome_popover_as_displayed();
42	32	}
43	33
44	34	private function is_first_or_second_editor_visit(): bool {
		@@ -57,31 +47,27 @@
57	47	private function set_welcome_popover_as_displayed(): void {
58	48	update_user_meta( $this->get_current_user_id(), Module::WELCOME_POPOVER_DISPLAYED_OPTION, true );
59	49	}
60	50
61		- private function register_package(): void {
	51	+ private function enqueue_scripts() {
62	52	$min_suffix = Utils::is_script_debug() ? '' : '.min';
63		- $package = self::PACKAGE_NAME;
64	53
65		- $assets_config_provider = ( new Assets_Config_Provider() )
66		- ->set_path_resolver( function ( $name ) {
67		- return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php";
68		- } );
69		-
70		- $config = $assets_config_provider->load( $package )->get( $package );
71		-
72		- if ( ! $config ) {
73		- return;
74		- }
75		-
76		- wp_register_script(
77		- $config['handle'],
78		- ELEMENTOR_ASSETS_URL . "js/packages/{$package}/{$package}{$min_suffix}.js",
79		- $config['deps'],
	54	+ wp_enqueue_script(
	55	+ Module::MODULE_NAME . '-welcome',
	56	+ ELEMENTOR_ASSETS_URL . 'js/editor-v4-welcome-opt-in' . $min_suffix . '.js',
	57	+ [
	58	+ 'react',
	59	+ 'react-dom',
	60	+ 'elementor-common',
	61	+ 'elementor-v2-ui',
	62	+ ],
80	63	ELEMENTOR_VERSION,
81	64	true
82	65	);
	66	+
	67	+ wp_set_script_translations( Module::MODULE_NAME . '-welcome', 'elementor' );
83	68	}
	69	+
84	70
85	71	private function get_current_user_id(): int {
86	72	$current_user = wp_get_current_user();
87	73	return $current_user->ID ?? 0;