| @@ -17,12 +17,9 @@ | ||
| 17 | 17 | exit; // Exit if accessed directly. |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | class Module extends BaseModule { |
| 21 | - const NAME = 'e_classes'; | |
| 22 | - const ENFORCE_CAPABILITIES_EXPERIMENT = 'global_classes_should_enforce_capabilities'; | |
| 23 | - | |
| 24 | - // TODO: Add global classes package | |
| 21 | + const NAME = Atomic_Widgets_Module::EXPERIMENT_NAME; | |
| 25 | 22 | const PACKAGES = [ |
| 26 | 23 | 'editor-global-classes', |
| 27 | 24 | ]; |
| 28 | 25 | |
| @@ -32,15 +29,11 @@ | ||
| 32 | 29 | |
| 33 | 30 | public function __construct() { |
| 34 | 31 | parent::__construct(); |
| 35 | 32 | |
| 36 | - $this->register_features(); | |
| 37 | - | |
| 38 | - $is_feature_active = Plugin::$instance->experiments->is_feature_active( self::NAME ); | |
| 39 | 33 | $is_atomic_widgets_active = Plugin::$instance->experiments->is_feature_active( Atomic_Widgets_Module::EXPERIMENT_NAME ); |
| 40 | 34 | |
| 41 | - // TODO: When the `e_atomic_elements` feature is not hidden, add it as a dependency | |
| 42 | - if ( $is_feature_active && $is_atomic_widgets_active ) { | |
| 35 | + if ( $is_atomic_widgets_active ) { | |
| 43 | 36 | ( new Global_Class_Post_Type() )->register(); |
| 44 | 37 | ( new Global_Classes_Post_IDs() )->register_hooks(); |
| 45 | 38 | |
| 46 | 39 | $relations = new Global_Classes_Relations(); |
| @@ -88,8 +81,9 @@ | ||
| 88 | 81 | |
| 89 | 82 | public function add_meta_to_preserve_on_kit_import( array $meta_keys ): array { |
| 90 | 83 | return array_merge( $meta_keys, [ |
| 91 | 84 | Global_Classes_Order::META_KEY, |
| 85 | + Global_Classes_Order::META_KEY_PREVIEW, | |
| 92 | 86 | Global_Classes_Labels::META_KEY_FRONTEND, |
| 93 | 87 | Global_Classes_Labels::META_KEY_PREVIEW, |
| 94 | 88 | Global_Classes_Relations::META_KEY_FRONTEND, |
| 95 | 89 | Global_Classes_Relations::META_KEY_PREVIEW, |
| @@ -117,37 +111,15 @@ | ||
| 117 | 111 | if ( ! $previous_kit || ! $new_kit ) { |
| 118 | 112 | return; |
| 119 | 113 | } |
| 120 | 114 | |
| 121 | - $all_classes = Global_Classes_Repository::make( $previous_kit )->get_order(); | |
| 115 | + $preview_order = Global_Classes_Order::make( $previous_kit )->set_preview( true )->get_order(); | |
| 116 | + $frontend_order = Global_Classes_Order::make( $previous_kit )->set_preview( false )->get_order(); | |
| 117 | + $all_classes = array_unique( array_merge( $preview_order, $frontend_order ) ); | |
| 122 | 118 | |
| 123 | 119 | foreach ( $all_classes as $class_id ) { |
| 124 | 120 | Global_Class_Post::clone_to_other_kit( $class_id, $previous_kit, $new_kit ); |
| 125 | 121 | } |
| 126 | - } | |
| 127 | - | |
| 128 | - private function register_features() { | |
| 129 | - Plugin::$instance->experiments->add_feature([ | |
| 130 | - 'name' => self::NAME, | |
| 131 | - 'title' => esc_html__( 'Global Classes', 'elementor' ), | |
| 132 | - 'description' => esc_html__( 'Enable global CSS classes.', 'elementor' ), | |
| 133 | - 'hidden' => true, | |
| 134 | - 'default' => Experiments_Manager::STATE_INACTIVE, | |
| 135 | - 'release_status' => Experiments_Manager::RELEASE_STATUS_ALPHA, | |
| 136 | - 'new_site' => [ | |
| 137 | - 'default_active' => true, | |
| 138 | - 'minimum_installation_version' => '4.0.0', | |
| 139 | - ], | |
| 140 | - ]); | |
| 141 | - | |
| 142 | - Plugin::$instance->experiments->add_feature([ | |
| 143 | - 'name' => self::ENFORCE_CAPABILITIES_EXPERIMENT, | |
| 144 | - 'title' => esc_html__( 'Enforce global classes capabilities', 'elementor' ), | |
| 145 | - 'description' => esc_html__( 'Enforce global classes capabilities.', 'elementor' ), | |
| 146 | - 'hidden' => true, | |
| 147 | - 'default' => Experiments_Manager::STATE_ACTIVE, | |
| 148 | - 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV, | |
| 149 | - ]); | |
| 150 | 122 | } |
| 151 | 123 | |
| 152 | 124 | private function add_packages( $packages ) { |
| 153 | 125 | return array_merge( $packages, self::PACKAGES ); |