wip

hein-obox · Dec 20, 2024 · ca429a5 · ca429a5
1 parent 55ed840
commit ca429a5
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 5 deletions.
diff --git a/assets/dev/js/frontend/frontend.js b/assets/dev/js/frontend/frontend.js
@@ -7,7 +7,7 @@ import YouTubeApiLoader from './utils/video-api/youtube-loader';
 import VimeoApiLoader from './utils/video-api/vimeo-loader';
 import BaseVideoLoader from './utils/video-api/base-loader';
 import URLActions from './utils/url-actions';
-import Swiper from './utils/swiper';
+import SwiperHandler from './utils/swiper';
 import LightboxManager from './utils/lightbox/lightbox-manager';
 import AssetsLoader from './utils/assets-loader';
 import Breakpoints from 'elementor-utils/breakpoints';
@@ -196,7 +196,7 @@ export default class Frontend extends elementorModules.ViewModule {
 				return LightboxManager.getLightbox();
 			},
 			urlActions: new URLActions(),
-			swiper: Swiper,
+			swiper: SwiperHandler,
 			environment,
 			assetsLoader: new AssetsLoader(),
 			escapeHTML,

diff --git a/assets/dev/js/frontend/utils/assets-loader.js b/assets/dev/js/frontend/utils/assets-loader.js
@@ -72,6 +72,7 @@ AssetsLoader.assets = {
 		'share-link': {
 			src: `${ assetsUrl }lib/share-link/share-link${ fileSuffix }.js?ver=${ pluginVersion }`,
 		},
+		// TODO: Remove 'swiper' in v3.29.0 [ED-16272].
 		swiper: {
 			src: `${ assetsUrl }lib/swiper/v8/swiper${ fileSuffix }.js?ver=8.4.5`,
 		},

diff --git a/assets/dev/js/frontend/utils/swiper.js b/assets/dev/js/frontend/utils/swiper.js
@@ -1,4 +1,4 @@
-export default class Swiper {
+export default class SwiperHandler {
 	constructor( container, config ) {
 		this.config = config;
 
@@ -17,8 +17,19 @@ export default class Swiper {
 		container.closest( '.elementor-widget' )?.classList.add( 'e-widget-swiper' );
 
 		return new Promise( ( resolve ) => {
-			elementorFrontend.utils.assetsLoader.load( 'script', 'swiper' )
-				.then( () => resolve( this.createSwiperInstance( container, this.config ) ) );
+			// TODO: Remove in v3.29.0 [ED-16272].
+			if ( 'undefined' === typeof Swiper ) {
+				elementorFrontend.utils.assetsLoader.load( 'script', 'swiper' )
+					.then( () => resolve( this.createSwiperInstance( container, this.config ) ) );
+
+				return;
+			}
+
+			if ( 'function' === typeof Swiper && 'undefined' === typeof window.Swiper ) {
+				window.Swiper = Swiper;
+			}
+
+			resolve( this.createSwiperInstance( container, this.config ) );
 		} );
 	}
 

diff --git a/includes/elements/column.php b/includes/elements/column.php
@@ -295,6 +295,43 @@ protected function register_controls() {
 			]
 		);
 
+		$this->add_control(
+			'handle_slideshow_asset_loading',
+			[
+				'type' => Controls_Manager::HIDDEN,
+				'assets' => [
+					'styles' => [
+						[
+							'name' => 'e-swiper',
+							'conditions' => [
+								'terms' => [
+									[
+										'name' => 'background_background',
+										'operator' => '===',
+										'value' => 'slideshow',
+									],
+								],
+							],
+						],
+					],
+					'scripts' => [
+						[
+							'name' => 'swiper',
+							'conditions' => [
+								'terms' => [
+									[
+										'name' => 'background_background',
+										'operator' => '===',
+										'value' => 'slideshow',
+									],
+								],
+							],
+						],
+					],
+				],
+			]
+		);
+
 		$this->end_controls_tab();
 
 		$this->start_controls_tab(

diff --git a/includes/elements/container.php b/includes/elements/container.php
@@ -675,6 +675,20 @@ protected function register_background_controls() {
 							],
 						],
 					],
+					'scripts' => [
+						[
+							'name' => 'swiper',
+							'conditions' => [
+								'terms' => [
+									[
+										'name' => 'background_background',
+										'operator' => '===',
+										'value' => 'slideshow',
+									],
+								],
+							],
+						],
+					],
 				],
 			]
 		);

diff --git a/includes/elements/section.php b/includes/elements/section.php
@@ -576,6 +576,20 @@ protected function register_controls() {
 							],
 						],
 					],
+					'scripts' => [
+						[
+							'name' => 'swiper',
+							'conditions' => [
+								'terms' => [
+									[
+										'name' => 'background_background',
+										'operator' => '===',
+										'value' => 'slideshow',
+									],
+								],
+							],
+						],
+					],
 				],
 			]
 		);

diff --git a/includes/widgets/image-carousel.php b/includes/widgets/image-carousel.php
@@ -92,6 +92,20 @@ public function get_style_depends(): array {
 		return [ 'e-swiper', 'widget-image-carousel' ];
 	}
 
+	/**
+	 * Get script dependencies.
+	 *
+	 * Retrieve the list of script dependencies the widget requires.
+	 *
+	 * @since 3.24.0
+	 * @access public
+	 *
+	 * @return array Widget script dependencies.
+	 */
+	public function get_script_depends(): array {
+		return [ 'swiper' ];
+	}
+
 	public function has_widget_inner_wrapper(): bool {
 		return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
 	}

diff --git a/includes/widgets/image-gallery.php b/includes/widgets/image-gallery.php
@@ -234,6 +234,25 @@ protected function register_controls() {
 							],
 						],
 					],
+					'scripts' => [
+						[
+							'name' => 'swiper',
+							'conditions' => [
+								'terms' => [
+									[
+										'name' => 'gallery_link',
+										'operator' => '===',
+										'value' => 'file',
+									],
+									[
+										'name' => 'open_lightbox',
+										'operator' => '!==',
+										'value' => 'no',
+									],
+								],
+							],
+						],
+					],
 				],
 			]
 		);

diff --git a/includes/widgets/wordpress.php b/includes/widgets/wordpress.php
@@ -122,6 +122,20 @@ public function get_style_depends(): array {
 		return [ 'e-swiper' ];
 	}
 
+	/**
+	 * Get script dependencies.
+	 *
+	 * Retrieve the list of script dependencies the widget requires.
+	 *
+	 * @since 3.24.0
+	 * @access public
+	 *
+	 * @return array Widget script dependencies.
+	 */
+	public function get_script_depends(): array {
+		return [ 'swiper' ];
+	}
+
 	public function get_help_url() {
 		return '';
 	}