| @@ -1,11 +1,17 @@ | ||
| 1 | 1 | <?php |
| 2 | +/** | |
| 3 | + * Assets Controller Class | |
| 4 | + * | |
| 5 | + * @package RadiusTheme\SB | |
| 6 | + */ | |
| 2 | 7 | |
| 3 | 8 | namespace RadiusTheme\SB\Controllers; |
| 4 | 9 | |
| 5 | -use RadiusTheme\SB\Helpers\BuilderFns; | |
| 10 | +use RadiusTheme\SB\AI\AIFns; | |
| 6 | 11 | use RadiusTheme\SB\Helpers\Fns; |
| 7 | 12 | use RadiusTheme\SB\Models\Settings; |
| 13 | +use RadiusTheme\SB\Helpers\BuilderFns; | |
| 8 | 14 | use RadiusTheme\SB\Traits\SingletonTrait; |
| 9 | 15 | |
| 10 | 16 | // Do not allow directly accessing this file. |
| 11 | 17 | if ( ! defined( 'ABSPATH' ) ) { |
| @@ -11,8 +17,11 @@ | ||
| 11 | 17 | if ( ! defined( 'ABSPATH' ) ) { |
| 12 | 18 | exit( 'This script cannot be accessed directly.' ); |
| 13 | 19 | } |
| 14 | 20 | |
| 21 | +/** | |
| 22 | + * Assets Controller Class | |
| 23 | + */ | |
| 15 | 24 | class AssetsController { |
| 16 | 25 | |
| 17 | 26 | use SingletonTrait; |
| 18 | 27 | |
| @@ -44,19 +53,27 @@ | ||
| 44 | 53 | */ |
| 45 | 54 | private $scripts = []; |
| 46 | 55 | |
| 47 | 56 | /** |
| 57 | + * Cached bundled assets. | |
| 58 | + * | |
| 59 | + * @var array|null | |
| 60 | + */ | |
| 61 | + private $cached_bundled_assets = null; | |
| 62 | + | |
| 63 | + /** | |
| 48 | 64 | * Class Constructor |
| 49 | 65 | */ |
| 50 | 66 | public function __construct() { |
| 51 | 67 | $this->version = ( defined( 'WP_DEBUG' ) && WP_DEBUG ) ? time() : RTSB_VERSION; |
| 52 | 68 | |
| 69 | + // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 53 | 70 | if ( in_array( 'sitepress-multilingual-cms/sitepress.php', get_option( 'active_plugins' ) ) ) { |
| 54 | 71 | self::$ajaxurl = admin_url( 'admin-ajax.php?lang=' . ICL_LANGUAGE_CODE ); |
| 55 | 72 | } else { |
| 56 | 73 | self::$ajaxurl = admin_url( 'admin-ajax.php' ); |
| 57 | 74 | } |
| 58 | - | |
| 75 | + add_filter( 'rtsb/optimizer/scripts/deps', [ $this, 'extend_shared_dependencies' ], 99 ); | |
| 59 | 76 | /** |
| 60 | 77 | * Admin scripts. |
| 61 | 78 | */ |
| 62 | 79 | add_action( 'admin_enqueue_scripts', [ $this, 'register_backend_assets' ], 1 ); |
| @@ -64,16 +81,28 @@ | ||
| 64 | 81 | |
| 65 | 82 | /** |
| 66 | 83 | * Public scripts. |
| 67 | 84 | */ |
| 68 | - add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_public_scripts' ], 15 ); | |
| 85 | + add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_public_scripts' ], 25 ); | |
| 69 | 86 | /** |
| 70 | 87 | * General scripts. |
| 71 | 88 | */ |
| 72 | 89 | add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_general_public_scripts' ], 30 ); |
| 73 | 90 | } |
| 74 | - | |
| 75 | 91 | /** |
| 92 | + * Shared dependencies. | |
| 93 | + * | |
| 94 | + * @param array $deps Dependencies. | |
| 95 | + * | |
| 96 | + * @return array | |
| 97 | + */ | |
| 98 | + public function extend_shared_dependencies( $deps ) { | |
| 99 | + if ( Fns::is_elementor_widget_active( 'products_slider' ) ) { | |
| 100 | + $deps[] = 'swiper'; | |
| 101 | + } | |
| 102 | + return array_unique( $deps ); | |
| 103 | + } | |
| 104 | + /** | |
| 76 | 105 | * Get all frontend scripts. |
| 77 | 106 | * |
| 78 | 107 | * @return void |
| 79 | 108 | */ |
| @@ -86,14 +115,20 @@ | ||
| 86 | 115 | * |
| 87 | 116 | * @return object |
| 88 | 117 | */ |
| 89 | 118 | private function get_public_styles() { |
| 90 | - $rtl_suffix = is_rtl() ? '-rtl' : ''; | |
| 119 | + $rtl_suffix = is_rtl() ? '-rtl' : ''; | |
| 120 | + $rtl_dir = is_rtl() ? trailingslashit( 'rtl' ) : trailingslashit( 'css' ); | |
| 121 | + | |
| 91 | 122 | $this->styles[] = [ |
| 123 | + 'handle' => 'rtsb-odometer', | |
| 124 | + 'src' => rtsb()->get_assets_uri( 'vendor/odometer/css/odometer.min.css' ), | |
| 125 | + ]; | |
| 126 | + | |
| 127 | + $this->styles[] = [ | |
| 92 | 128 | 'handle' => 'rtsb-fonts', |
| 93 | 129 | 'src' => rtsb()->get_assets_uri( 'css/frontend/rtsb-fonts.css' ), |
| 94 | 130 | ]; |
| 95 | - | |
| 96 | 131 | if ( rtsb()->has_pro() ) { |
| 97 | 132 | $this->styles[] = [ |
| 98 | 133 | 'handle' => 'rtsb-noui-slider', |
| 99 | 134 | 'src' => rtsbpro()->get_assets_uri( 'vendors/nouislider/nouislider.min.css' ), |
| @@ -99,18 +134,25 @@ | ||
| 99 | 134 | 'src' => rtsbpro()->get_assets_uri( 'vendors/nouislider/nouislider.min.css' ), |
| 100 | 135 | ]; |
| 101 | 136 | } |
| 102 | 137 | |
| 103 | - $this->styles[] = [ | |
| 104 | - 'handle' => 'rtsb-frontend', | |
| 105 | - 'src' => rtsb()->get_assets_uri( 'css/frontend/frontend' . $rtl_suffix . '.css' ), | |
| 106 | - ]; | |
| 138 | + $pro_version = defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : '0'; | |
| 139 | + $addon_condition = version_compare( $pro_version, '1.9.0', '<' ); | |
| 107 | 140 | |
| 108 | - $this->styles[] = [ | |
| 109 | - 'handle' => 'swiper', | |
| 110 | - 'src' => rtsb()->get_assets_uri( 'vendor/swiper/css/swiper-bundle.min.css' ), | |
| 111 | - ]; | |
| 112 | - | |
| 141 | + if ( ! rtsb()->has_pro() && Fns::is_optimization_enabled() ) { | |
| 142 | + $this->styles[] = AssetRegistry::instance()->load_optimized_assets(); | |
| 143 | + } else { | |
| 144 | + if ( $addon_condition ) { | |
| 145 | + $this->styles[] = [ | |
| 146 | + 'handle' => 'rtsb-general-addons', | |
| 147 | + 'src' => rtsb()->get_assets_uri( $rtl_dir . 'frontend/general-addons' . $rtl_suffix . '.css' ), | |
| 148 | + ]; | |
| 149 | + } | |
| 150 | + $this->styles[] = [ | |
| 151 | + 'handle' => 'rtsb-frontend', | |
| 152 | + 'src' => rtsb()->get_assets_uri( $rtl_dir . 'frontend/frontend' . $rtl_suffix . '.css' ), | |
| 153 | + ]; | |
| 154 | + } | |
| 113 | 155 | if ( BuilderFns::is_builder_preview() && 'elementor' == Fns::page_edit_with( get_the_ID() ) ) { |
| 114 | 156 | $this->styles[] = [ |
| 115 | 157 | 'handle' => 'photoswipe', |
| 116 | 158 | 'src' => plugins_url( 'assets/css/photoswipe/photoswipe.min.css', WC_PLUGIN_FILE ), |
| @@ -136,40 +178,26 @@ | ||
| 136 | 178 | * |
| 137 | 179 | * @return object |
| 138 | 180 | */ |
| 139 | 181 | private function get_public_scripts() { |
| 140 | - | |
| 141 | - $default_swiper_path = rtsb()->get_assets_uri( 'vendor/swiper/js/swiper-bundle.min.js' ); | |
| 142 | - | |
| 143 | - if ( defined( 'ELEMENTOR_ASSETS_PATH' ) ) { | |
| 144 | - $is_swiper8_enable = get_option( 'elementor_experiment-e_swiper_latest' ); | |
| 145 | - | |
| 146 | - if ( 'active' === $is_swiper8_enable || 'default' === $is_swiper8_enable ) { | |
| 147 | - $el_swiper_path = 'lib/swiper/v8/swiper.min.js'; | |
| 148 | - } else { | |
| 149 | - $el_swiper_path = 'lib/swiper/swiper.min.js'; | |
| 150 | - } | |
| 151 | - | |
| 152 | - $elementor_swiper_path = ELEMENTOR_ASSETS_PATH . $el_swiper_path; | |
| 153 | - | |
| 154 | - if ( file_exists( $elementor_swiper_path ) ) { | |
| 155 | - $default_swiper_path = ELEMENTOR_ASSETS_URL . $el_swiper_path; | |
| 156 | - } | |
| 157 | - } | |
| 158 | - | |
| 159 | 182 | $this->scripts[] = [ |
| 160 | 183 | 'handle' => 'swiper', |
| 161 | - 'src' => esc_url( $default_swiper_path ), | |
| 184 | + 'src' => esc_url( $this->get_swiper_url() ), | |
| 162 | 185 | 'deps' => [ 'jquery' ], |
| 163 | 186 | 'footer' => true, |
| 164 | 187 | ]; |
| 165 | - | |
| 166 | 188 | $this->scripts[] = [ |
| 167 | - 'handle' => 'rtsb-imagesloaded', | |
| 168 | - 'src' => rtsb()->get_assets_uri( 'vendor/isotope/imagesloaded.pkgd.min.js' ), | |
| 189 | + 'handle' => 'rtsb-waypoints', | |
| 190 | + 'src' => rtsb()->get_assets_uri( 'vendor/waypoints/js/jquery.waypoints.min.js' ), | |
| 169 | 191 | 'deps' => [ 'jquery' ], |
| 170 | 192 | 'footer' => true, |
| 171 | 193 | ]; |
| 194 | + $this->scripts[] = [ | |
| 195 | + 'handle' => 'rtsb-odometer', | |
| 196 | + 'src' => rtsb()->get_assets_uri( 'vendor/odometer/js/odometer.min.js' ), | |
| 197 | + 'deps' => [ 'jquery' ], | |
| 198 | + 'footer' => true, | |
| 199 | + ]; | |
| 172 | 200 | |
| 173 | 201 | $this->scripts[] = [ |
| 174 | 202 | 'handle' => 'rtsb-tipsy', |
| 175 | 203 | 'src' => rtsb()->get_assets_uri( 'vendor/tipsy/tipsy.min.js' ), |
| @@ -178,9 +206,9 @@ | ||
| 178 | 206 | ]; |
| 179 | 207 | |
| 180 | 208 | if ( BuilderFns::is_builder_preview() && 'elementor' == Fns::page_edit_with( get_the_ID() ) ) { |
| 181 | 209 | $this->scripts[] = [ |
| 182 | - 'handle' => 'flexslider', | |
| 210 | + 'handle' => 'wc-flexslider', | |
| 183 | 211 | 'src' => plugins_url( 'assets/js/flexslider/jquery.flexslider.js', WC_PLUGIN_FILE ), |
| 184 | 212 | 'deps' => [ 'jquery' ], |
| 185 | 213 | 'footer' => true, |
| 186 | 214 | ]; |
| @@ -192,9 +220,9 @@ | ||
| 192 | 220 | 'footer' => true, |
| 193 | 221 | ]; |
| 194 | 222 | |
| 195 | 223 | $this->scripts[] = [ |
| 196 | - 'handle' => 'zoom', | |
| 224 | + 'handle' => 'wc-zoom', | |
| 197 | 225 | 'src' => plugins_url( 'assets/js/zoom/jquery.zoom.js', WC_PLUGIN_FILE ), |
| 198 | 226 | 'deps' => [ 'jquery' ], |
| 199 | 227 | 'footer' => true, |
| 200 | 228 | ]; |
| @@ -199,9 +227,9 @@ | ||
| 199 | 227 | 'footer' => true, |
| 200 | 228 | ]; |
| 201 | 229 | |
| 202 | 230 | $this->scripts[] = [ |
| 203 | - 'handle' => 'photoswipe-ui-default', | |
| 231 | + 'handle' => 'wc-photoswipe-ui-default', | |
| 204 | 232 | 'src' => plugins_url( 'assets/js/photoswipe/photoswipe-ui-default.js', WC_PLUGIN_FILE ), |
| 205 | 233 | 'deps' => [ 'jquery', 'photoswipe' ], |
| 206 | 234 | 'footer' => true, |
| 207 | 235 | ]; |
| @@ -208,9 +236,9 @@ | ||
| 208 | 236 | |
| 209 | 237 | $this->scripts[] = [ |
| 210 | 238 | 'handle' => 'wc-single-product', |
| 211 | 239 | 'src' => plugins_url( 'assets/js/frontend/single-product.js', WC_PLUGIN_FILE ), |
| 212 | - 'deps' => [ 'jquery', 'flexslider', 'photoswipe', 'photoswipe-ui-default', 'zoom' ], | |
| 240 | + 'deps' => [ 'jquery', 'wc-flexslider', 'photoswipe', 'wc-photoswipe-ui-default', 'wc-zoom' ], | |
| 213 | 241 | 'footer' => true, |
| 214 | 242 | ]; |
| 215 | 243 | |
| 216 | 244 | } |
| @@ -228,16 +256,34 @@ | ||
| 228 | 256 | 'src' => rtsbpro()->get_assets_uri( 'vendors/sticky-sidebar/sticky-sidebar.min.js' ), |
| 229 | 257 | 'deps' => [ 'jquery' ], |
| 230 | 258 | 'footer' => true, |
| 231 | 259 | ]; |
| 260 | + | |
| 261 | + $this->scripts[] = [ | |
| 262 | + 'handle' => 'rtsb-popper', | |
| 263 | + 'src' => rtsbpro()->get_assets_uri( 'vendors/tippy/popper.min.js' ), | |
| 264 | + 'deps' => [ 'jquery' ], | |
| 265 | + 'footer' => true, | |
| 266 | + ]; | |
| 267 | + | |
| 268 | + $this->scripts[] = [ | |
| 269 | + 'handle' => 'rtsb-tippy', | |
| 270 | + 'src' => rtsbpro()->get_assets_uri( 'vendors/tippy/tippy.min.js' ), | |
| 271 | + 'deps' => [ 'jquery', 'rtsb-popper' ], | |
| 272 | + 'footer' => true, | |
| 273 | + ]; | |
| 232 | 274 | } |
| 233 | 275 | |
| 234 | - $this->scripts[] = [ | |
| 235 | - 'handle' => 'rtsb-public', | |
| 236 | - 'src' => rtsb()->get_assets_uri( 'js/frontend/frontend.js' ), | |
| 237 | - 'deps' => [ 'jquery', 'rtsb-imagesloaded', 'swiper' ], | |
| 238 | - 'footer' => true, | |
| 239 | - ]; | |
| 276 | + if ( ! rtsb()->has_pro() && Fns::is_optimization_enabled() ) { | |
| 277 | + $this->scripts[] = AssetRegistry::instance()->load_optimized_assets( 'js' ); | |
| 278 | + } else { | |
| 279 | + $this->scripts[] = [ | |
| 280 | + 'handle' => 'rtsb-public', | |
| 281 | + 'src' => rtsb()->get_assets_uri( 'js/frontend/frontend.js' ), | |
| 282 | + 'deps' => [ 'jquery', 'imagesloaded', 'swiper' ], | |
| 283 | + 'footer' => true, | |
| 284 | + ]; | |
| 285 | + } | |
| 240 | 286 | |
| 241 | 287 | return $this; |
| 242 | 288 | } |
| 243 | 289 | |
| @@ -247,8 +293,10 @@ | ||
| 247 | 293 | * @return void |
| 248 | 294 | */ |
| 249 | 295 | public function register_public_scripts() { |
| 250 | 296 | $this->get_public_assets(); |
| 297 | + $this->styles = array_filter( $this->styles ); | |
| 298 | + $this->scripts = array_filter( $this->scripts ); | |
| 251 | 299 | |
| 252 | 300 | // Register public styles. |
| 253 | 301 | foreach ( $this->styles as $style ) { |
| 254 | 302 | wp_register_style( $style['handle'], $style['src'], '', $this->version ); |
| @@ -269,8 +317,9 @@ | ||
| 269 | 317 | /** |
| 270 | 318 | * Register scripts. |
| 271 | 319 | */ |
| 272 | 320 | $this->register_public_scripts(); |
| 321 | + | |
| 273 | 322 | /** |
| 274 | 323 | * Enqueue scripts. |
| 275 | 324 | */ |
| 276 | 325 | if ( BuilderFns::is_builder_preview() && 'elementor' === Fns::page_edit_with( get_the_ID() ) ) { |
| @@ -276,9 +325,8 @@ | ||
| 276 | 325 | if ( BuilderFns::is_builder_preview() && 'elementor' === Fns::page_edit_with( get_the_ID() ) ) { |
| 277 | 326 | /** |
| 278 | 327 | * Styles. |
| 279 | 328 | */ |
| 280 | - wp_enqueue_style( 'swiper' ); | |
| 281 | 329 | wp_enqueue_style( 'photoswipe' ); |
| 282 | 330 | wp_enqueue_style( 'photoswipe-default-skin' ); |
| 283 | 331 | wp_enqueue_style( 'elementor-editor-style-fix' ); |
| 284 | 332 | wp_enqueue_style( 'woocommerce-general' ); |
| @@ -285,27 +333,31 @@ | ||
| 285 | 333 | |
| 286 | 334 | /** |
| 287 | 335 | * Scripts. |
| 288 | 336 | */ |
| 289 | - wp_enqueue_script( 'flexslider' ); | |
| 337 | + $handle = Fns::optimized_handle( 'rtsb-public' ); | |
| 338 | + | |
| 339 | + wp_enqueue_script( 'wc-flexslider' ); | |
| 290 | 340 | wp_enqueue_script( 'wc-single-product' ); |
| 291 | - wp_dequeue_script( 'rtsb-public' ); | |
| 341 | + wp_dequeue_script( $handle ); | |
| 292 | 342 | wp_enqueue_script( 'swiper' ); |
| 293 | - wp_enqueue_script( 'rtsb-public' ); | |
| 343 | + | |
| 344 | + if ( Fns::is_optimization_enabled() ) { | |
| 345 | + Fns::enqueue_optimized_assets(); | |
| 346 | + } else { | |
| 347 | + wp_enqueue_script( $handle ); | |
| 348 | + } | |
| 294 | 349 | } |
| 295 | 350 | |
| 296 | - /** | |
| 297 | - * Styles. | |
| 298 | - */ | |
| 299 | - wp_enqueue_style( 'rtsb-fonts' ); | |
| 300 | - wp_enqueue_style( 'rtsb-frontend' ); | |
| 351 | + wp_enqueue_script( 'rtsb-tipsy' ); | |
| 301 | 352 | |
| 302 | - /** | |
| 303 | - * Scripts. | |
| 304 | - */ | |
| 305 | - wp_enqueue_script( 'rtsb-imagesloaded' ); | |
| 306 | - wp_enqueue_script( 'rtsb-tipsy' ); | |
| 307 | - wp_enqueue_script( 'rtsb-public' ); | |
| 353 | + if ( Fns::is_optimization_enabled() ) { | |
| 354 | + Fns::enqueue_optimized_assets(); | |
| 355 | + } else { | |
| 356 | + wp_enqueue_style( 'rtsb-fonts' ); | |
| 357 | + wp_enqueue_style( 'rtsb-frontend' ); | |
| 358 | + wp_enqueue_script( 'rtsb-public' ); | |
| 359 | + } | |
| 308 | 360 | |
| 309 | 361 | /** |
| 310 | 362 | * Localize script. |
| 311 | 363 | */ |
| @@ -318,24 +370,30 @@ | ||
| 318 | 370 | * @static |
| 319 | 371 | * @return void |
| 320 | 372 | */ |
| 321 | 373 | public static function localizeData() { |
| 374 | + $handle = Fns::optimized_handle( 'rtsb-public' ); | |
| 375 | + $ai_data = AIFns::activated_ai_data(); | |
| 322 | 376 | wp_localize_script( |
| 323 | - 'rtsb-public', | |
| 377 | + $handle, | |
| 324 | 378 | 'rtsbPublicParams', |
| 325 | 379 | [ |
| 326 | - 'ajaxUrl' => esc_url( self::$ajaxurl ), | |
| 327 | - 'homeurl' => home_url(), | |
| 328 | - 'wcCartUrl' => wc_get_cart_url(), | |
| 329 | - 'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ), | |
| 330 | - 'singleCartToastrText' => esc_html__( 'Successfully Added', 'shopbuilder' ), | |
| 331 | - 'singleCartBtnText' => apply_filters( 'rtsb/global/single_add_to_cart_success', esc_html__( 'Added to Cart', 'shopbuilder' ) ), | |
| 332 | - 'browseCartText' => esc_html__( 'Browse Cart', 'shopbuilder' ), | |
| 333 | - 'noProductsText' => apply_filters( 'rtsb/global/no_products_text', esc_html__( 'No more products to load', 'shopbuilder' ) ), | |
| 334 | - 'notice' => [ | |
| 380 | + 'ajaxUrl' => esc_url( self::$ajaxurl ), | |
| 381 | + 'aiActivated' => ! empty( $ai_data ), | |
| 382 | + 'homeurl' => home_url(), | |
| 383 | + 'wcCartUrl' => wc_get_cart_url(), | |
| 384 | + 'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ), | |
| 385 | + 'singleCartToastrText' => esc_html__( 'Successfully Added', 'shopbuilder' ), | |
| 386 | + 'singleCartBtnText' => apply_filters( 'rtsb/global/single_add_to_cart_success', esc_html__( 'Added to Cart', 'shopbuilder' ) ), | |
| 387 | + 'browseCartText' => esc_html__( 'Browse Cart', 'shopbuilder' ), | |
| 388 | + 'noProductsText' => apply_filters( 'rtsb/global/no_products_text', esc_html__( 'No more products to load', 'shopbuilder' ) ), | |
| 389 | + 'isOptimizationEnabled' => Fns::is_optimization_enabled(), | |
| 390 | + 'isLoaderEnabled' => Fns::enable_loader(), | |
| 391 | + 'notice' => [ | |
| 335 | 392 | 'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ), |
| 393 | + 'timeOut' => absint( Fns::get_option( 'general', 'notification', 'notification_timeOut', 5 ) ), | |
| 336 | 394 | ], |
| 337 | - rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ), | |
| 395 | + rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ), | |
| 338 | 396 | ] |
| 339 | 397 | ); |
| 340 | 398 | } |
| 341 | 399 | |
| @@ -367,23 +425,60 @@ | ||
| 367 | 425 | * Scripts. |
| 368 | 426 | */ |
| 369 | 427 | wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true ); |
| 370 | 428 | wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true ); |
| 429 | + wp_localize_script( | |
| 430 | + 'rtsb-admin-app', | |
| 431 | + 'rtsbParams', | |
| 432 | + [ | |
| 433 | + 'ajaxurl' => esc_url( self::$ajaxurl ), | |
| 434 | + 'homeurl' => home_url(), | |
| 435 | + 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ), | |
| 436 | + 'blackFriday' => rtsb()->get_assets_uri( 'images/black-friday-ribbon.svg' ), | |
| 437 | + 'restApiUrl' => esc_url_raw( rest_url() ), | |
| 438 | + 'rest_nonce' => wp_create_nonce( 'wp_rest' ), | |
| 439 | + 'nonce' => wp_create_nonce( rtsb()->nonceText ), | |
| 440 | + 'pages' => Fns::get_pages(), | |
| 441 | + 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no', | |
| 442 | + 'validLicence' => Fns::has_valid_license() ? 'yes' : 'no', | |
| 443 | + 'proVersion' => defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : '0', | |
| 444 | + 'updateRates' => esc_html__( 'Update All Rates', 'shopbuilder' ), | |
| 445 | + 'sections' => Settings::instance()->get_sections(), | |
| 446 | + 'userRoles' => Fns::get_all_user_roles(), | |
| 447 | + 'hasElementor' => defined( 'ELEMENTOR_VERSION' ), | |
| 448 | + 'loadElementor' => Fns::should_load_elementor_scripts(), | |
| 449 | + 'isOptimizationEnabled' => Fns::is_optimization_enabled(), | |
| 450 | + ] | |
| 451 | + ); | |
| 452 | + wp_localize_script( | |
| 453 | + 'rtsb-admin-app', | |
| 454 | + 'rtsbCaAbandonment', | |
| 455 | + [ | |
| 456 | + 'mainTitle' => esc_html__( 'Abandoned Carts Follow Up', 'shopbuilder' ), | |
| 457 | + 'followUpColumnTitle' => [ | |
| 458 | + 'UserName' => esc_html__( 'Name', 'shopbuilder' ), | |
| 459 | + 'EmailTo' => esc_html__( 'Email To', 'shopbuilder' ), | |
| 460 | + 'CartTotal' => esc_html__( 'Cart Total', 'shopbuilder' ), | |
| 461 | + 'OrderStatus' => esc_html__( 'Order Status', 'shopbuilder' ), | |
| 462 | + 'DateTime' => esc_html__( 'Date / Time', 'shopbuilder' ), | |
| 463 | + 'Action' => esc_html__( 'Action', 'shopbuilder' ), | |
| 464 | + ], | |
| 465 | + ] | |
| 466 | + ); | |
| 371 | 467 | } |
| 372 | 468 | |
| 373 | 469 | /** |
| 374 | 470 | * Enqueues admin scripts. |
| 375 | 471 | * |
| 376 | - * @param string $hook Hooks. | |
| 377 | - * | |
| 378 | 472 | * @return void |
| 379 | 473 | */ |
| 380 | - public function enqueue_backend_scripts( $hook ) { | |
| 474 | + public function enqueue_backend_scripts() { | |
| 381 | 475 | ob_start(); ?> |
| 382 | 476 | #adminmenu .toplevel_page_rtsb .wp-menu-image img { |
| 383 | 477 | width: auto; |
| 384 | 478 | height: 22px; |
| 385 | 479 | padding: 4px 0; |
| 480 | + box-sizing: content-box; | |
| 386 | 481 | } |
| 387 | 482 | .post-type-rtsb_builder li#wp-admin-bar-WPML_ALS_all, |
| 388 | 483 | .post-type-rtsb_builder li.language_all{ |
| 389 | 484 | display: none; |
| @@ -392,12 +487,22 @@ | ||
| 392 | 487 | <?php |
| 393 | 488 | $admin_global_style = ob_get_clean(); |
| 394 | 489 | // Speed Optimization. |
| 395 | 490 | wp_add_inline_style( 'admin-menu', $admin_global_style ); |
| 396 | - // wp_enqueue_style( 'rtsb-admin-global' ); | |
| 397 | 491 | |
| 398 | 492 | global $pagenow; |
| 399 | 493 | |
| 494 | + $whitelisted_pages = [ 'rtsb-settings', 'rtsb-get-help', 'rtsb-themes' ]; | |
| 495 | + $current_page = ! empty( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 496 | + | |
| 497 | + if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && in_array( $current_page, $whitelisted_pages, true ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 498 | + /** | |
| 499 | + * Styles. | |
| 500 | + */ | |
| 501 | + wp_enqueue_style( 'rtsb-admin-app' ); | |
| 502 | + wp_enqueue_style( 'rtsb-fonts' ); | |
| 503 | + } | |
| 504 | + | |
| 400 | 505 | if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended |
| 401 | 506 | // Elementor Console Error Fixed For "rtsb-settings" Page. |
| 402 | 507 | wp_dequeue_script( 'elementor-admin-top-bar' ); |
| 403 | 508 | wp_dequeue_script( 'elementor-common' ); |
| @@ -405,8 +510,9 @@ | ||
| 405 | 510 | wp_dequeue_script( 'elementor-web-cli' ); |
| 406 | 511 | wp_dequeue_script( 'elementor-import-export-admin' ); |
| 407 | 512 | wp_dequeue_script( 'elementor-app-loader' ); |
| 408 | 513 | wp_dequeue_script( 'elementor-admin-modules' ); |
| 514 | + wp_dequeue_script( 'elementor-ai-media-library' ); | |
| 409 | 515 | wp_dequeue_script( 'elementor-admin' ); |
| 410 | 516 | |
| 411 | 517 | wp_dequeue_style( 'elementor-admin-top-bar' ); |
| 412 | 518 | wp_dequeue_style( 'elementor-admin' ); |
| @@ -413,34 +519,13 @@ | ||
| 413 | 519 | wp_dequeue_style( 'e-theme-ui-light' ); |
| 414 | 520 | wp_dequeue_style( 'elementor-common' ); |
| 415 | 521 | |
| 416 | 522 | /** |
| 417 | - * Styles. | |
| 418 | - */ | |
| 419 | - wp_enqueue_style( 'rtsb-admin-app' ); | |
| 420 | - wp_enqueue_style( 'rtsb-fonts' ); | |
| 421 | - | |
| 422 | - /** | |
| 423 | 523 | * Scripts. |
| 424 | 524 | */ |
| 525 | + wp_enqueue_media(); | |
| 425 | 526 | wp_enqueue_script( 'updates' ); |
| 426 | 527 | wp_enqueue_script( 'rtsb-admin-app' ); |
| 427 | - wp_localize_script( | |
| 428 | - 'rtsb-admin-app', | |
| 429 | - 'rtsbParams', | |
| 430 | - [ | |
| 431 | - 'ajaxurl' => esc_url( self::$ajaxurl ), | |
| 432 | - 'homeurl' => home_url(), | |
| 433 | - 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ), | |
| 434 | - 'restApiUrl' => esc_url_raw( rest_url() ), | |
| 435 | - 'rest_nonce' => wp_create_nonce( 'wp_rest' ), | |
| 436 | - 'nonce' => wp_create_nonce( rtsb()->nonceText ), | |
| 437 | - 'sections' => Settings::instance()->get_sections(), | |
| 438 | - 'pages' => Fns::get_pages(), | |
| 439 | - 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no', | |
| 440 | - 'updateRates' => esc_html__( 'Update All Rates', 'shopbuilder' ), | |
| 441 | - ] | |
| 442 | - ); | |
| 443 | 528 | } else { |
| 444 | 529 | $current_screen = get_current_screen(); |
| 445 | 530 | |
| 446 | 531 | if ( 'edit-rtsb_builder' === $current_screen->id ) { |
| @@ -488,8 +573,9 @@ | ||
| 488 | 573 | |
| 489 | 574 | if ( ! empty( $notification_color ) ) { |
| 490 | 575 | $dynamic_css .= ".rtsb-shopbuilder-plugin #toast-container .toast-success{color:{$notification_color}}"; |
| 491 | 576 | $dynamic_css .= ".rtsb-shopbuilder-plugin #toast-container .toast-success:before{background-color:{$notification_color}}"; |
| 577 | + $dynamic_css .= ".rtsb-shopbuilder-plugin #toast-container .toast-close-button{color:{$notification_color}}"; | |
| 492 | 578 | } |
| 493 | 579 | |
| 494 | 580 | if ( ! empty( $notification_bgcolor ) ) { |
| 495 | 581 | $dynamic_css .= ".rtsb-shopbuilder-plugin #toast-container .toast-success{background-color:{$notification_bgcolor}}"; |
| @@ -499,8 +585,33 @@ | ||
| 499 | 585 | $dynamic_css .= ".rtsb-shopbuilder-plugin #toast-container .toast-success a{color:{$notification_button_color}}"; |
| 500 | 586 | } |
| 501 | 587 | |
| 502 | 588 | if ( ! empty( $dynamic_css ) ) { |
| 503 | - wp_add_inline_style( 'rtsb-frontend', $dynamic_css ); | |
| 589 | + wp_add_inline_style( Fns::optimized_handle( 'rtsb-frontend' ), $dynamic_css ); | |
| 504 | 590 | } |
| 591 | + } | |
| 592 | + | |
| 593 | + /** | |
| 594 | + * Get the appropriate Swiper JS file URL. | |
| 595 | + * | |
| 596 | + * @return string | |
| 597 | + */ | |
| 598 | + private function get_swiper_url() { | |
| 599 | + $default_swiper_url = rtsb()->get_assets_uri( 'vendor/swiper/js/swiper-bundle.min.js' ); | |
| 600 | + | |
| 601 | + if ( defined( 'ELEMENTOR_ASSETS_PATH' ) && defined( 'ELEMENTOR_ASSETS_URL' ) ) { | |
| 602 | + $experiment = get_option( 'elementor_experiment-e_swiper_latest' ); | |
| 603 | + | |
| 604 | + $el_relative_path = ( 'active' === $experiment || 'default' === $experiment ) | |
| 605 | + ? 'lib/swiper/v8/swiper.min.js' | |
| 606 | + : 'lib/swiper/swiper.min.js'; | |
| 607 | + | |
| 608 | + $el_full_path = ELEMENTOR_ASSETS_PATH . $el_relative_path; | |
| 609 | + | |
| 610 | + if ( file_exists( $el_full_path ) ) { | |
| 611 | + return ELEMENTOR_ASSETS_URL . $el_relative_path; | |
| 612 | + } | |
| 613 | + } | |
| 614 | + | |
| 615 | + return $default_swiper_url; | |
| 505 | 616 | } |
| 506 | 617 | } |
