| @@ -5,13 +5,11 @@ | ||
| 5 | 5 | use Elementor\Core\Common\Modules\Ajax\Module as Ajax; |
| 6 | 6 | use Elementor\Core\Common\Modules\Finder\Module as Finder; |
| 7 | 7 | use Elementor\Core\Common\Modules\Connect\Module as Connect; |
| 8 | 8 | use Elementor\Core\Common\Modules\EventTracker\Module as Event_Tracker; |
| 9 | -use Elementor\Core\Common\Modules\EventsManager\Module as Events_Manager; | |
| 10 | 9 | use Elementor\Core\Files\Uploads_Manager; |
| 11 | 10 | use Elementor\Icons_Manager; |
| 12 | 11 | use Elementor\Plugin; |
| 13 | -use Elementor\Utils; | |
| 14 | 12 | |
| 15 | 13 | if ( ! defined( 'ABSPATH' ) ) { |
| 16 | 14 | exit; // Exit if accessed directly. |
| 17 | 15 | } |
| @@ -35,11 +33,11 @@ | ||
| 35 | 33 | */ |
| 36 | 34 | public function __construct() { |
| 37 | 35 | $this->add_default_templates(); |
| 38 | 36 | |
| 39 | - add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ], 9 ); | |
| 40 | - add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ], 9 ); | |
| 41 | - add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ], 9 ); | |
| 37 | + add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'register_scripts' ] ); | |
| 38 | + add_action( 'admin_enqueue_scripts', [ $this, 'register_scripts' ] ); | |
| 39 | + add_action( 'wp_enqueue_scripts', [ $this, 'register_scripts' ] ); | |
| 42 | 40 | |
| 43 | 41 | add_action( 'elementor/editor/before_enqueue_styles', [ $this, 'register_styles' ] ); |
| 44 | 42 | add_action( 'admin_enqueue_scripts', [ $this, 'register_styles' ] ); |
| 45 | 43 | add_action( 'wp_enqueue_scripts', [ $this, 'register_styles' ], 9 ); |
| @@ -68,14 +66,8 @@ | ||
| 68 | 66 | |
| 69 | 67 | $this->add_component( 'connect', new Connect() ); |
| 70 | 68 | |
| 71 | 69 | $this->add_component( 'event-tracker', new Event_Tracker() ); |
| 72 | - | |
| 73 | - Plugin::$instance->experiments->add_feature( Events_Manager::get_experimental_data() ); | |
| 74 | - | |
| 75 | - if ( Plugin::$instance->experiments->is_feature_active( Events_Manager::EXPERIMENT_NAME ) ) { | |
| 76 | - $this->add_component( 'events-manager', new Events_Manager() ); | |
| 77 | - } | |
| 78 | 70 | } |
| 79 | 71 | |
| 80 | 72 | /** |
| 81 | 73 | * Get name. |
| @@ -187,15 +179,8 @@ | ||
| 187 | 179 | 'elementor-icons', |
| 188 | 180 | ], |
| 189 | 181 | ELEMENTOR_VERSION |
| 190 | 182 | ); |
| 191 | - | |
| 192 | - wp_enqueue_style( | |
| 193 | - 'e-theme-ui-light', | |
| 194 | - $this->get_css_assets_url( 'theme-light' ), | |
| 195 | - [], | |
| 196 | - ELEMENTOR_VERSION | |
| 197 | - ); | |
| 198 | 183 | } |
| 199 | 184 | |
| 200 | 185 | /** |
| 201 | 186 | * Add template. |
| @@ -245,26 +230,18 @@ | ||
| 245 | 230 | * @return array |
| 246 | 231 | */ |
| 247 | 232 | protected function get_init_settings() { |
| 248 | 233 | $active_experimental_features = Plugin::$instance->experiments->get_active_features(); |
| 249 | - $all_experimental_features = Plugin::$instance->experiments->get_features(); | |
| 250 | 234 | |
| 251 | 235 | $active_experimental_features = array_fill_keys( array_keys( $active_experimental_features ), true ); |
| 252 | - $all_experimental_features = array_map( | |
| 253 | - function( $feature ) { | |
| 254 | - return Plugin::$instance->experiments->is_feature_active( $feature['name'] ); | |
| 255 | - }, | |
| 256 | - $all_experimental_features | |
| 257 | - ); | |
| 258 | 236 | |
| 259 | 237 | $config = [ |
| 260 | 238 | 'version' => ELEMENTOR_VERSION, |
| 261 | 239 | 'isRTL' => is_rtl(), |
| 262 | 240 | 'isDebug' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), |
| 263 | - 'isElementorDebug' => Utils::is_elementor_debug(), | |
| 241 | + 'isElementorDebug' => ( defined( 'ELEMENTOR_DEBUG' ) && ELEMENTOR_DEBUG ), | |
| 264 | 242 | 'activeModules' => array_keys( $this->get_components() ), |
| 265 | 243 | 'experimentalFeatures' => $active_experimental_features, |
| 266 | - 'allExperimentalFeatures' => $all_experimental_features, | |
| 267 | 244 | 'urls' => [ |
| 268 | 245 | 'assets' => ELEMENTOR_ASSETS_URL, |
| 269 | 246 | 'rest' => get_rest_url(), |
| 270 | 247 | ], |
| @@ -270,9 +247,8 @@ | ||
| 270 | 247 | ], |
| 271 | 248 | 'filesUpload' => [ |
| 272 | 249 | 'unfilteredFiles' => Uploads_Manager::are_unfiltered_uploads_enabled(), |
| 273 | 250 | ], |
| 274 | - 'editor_events' => Events_Manager::get_editor_events_config(), | |
| 275 | 251 | ]; |
| 276 | 252 | |
| 277 | 253 | /** |
| 278 | 254 | * Localize common settings. |
| @@ -289,9 +265,8 @@ | ||
| 289 | 265 | /** |
| 290 | 266 | * Add default templates. |
| 291 | 267 | * |
| 292 | 268 | * Register common app default templates. |
| 293 | - * | |
| 294 | 269 | * @since 2.3.0 |
| 295 | 270 | * @access private |
| 296 | 271 | */ |
| 297 | 272 | private function add_default_templates() { |