Merge pull request woocommerce#18208 from MannyC/master

Allow back end to pass adhoc options to the product flexslider
alexminza · Dec 20, 2017 · 6766ba2 · 6766ba2
2 parents 3877c82 + 1252215
commit 6766ba2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
@@ -138,23 +138,17 @@ jQuery( function( $ ) {
 		var $target = this.$target,
 			gallery = this;
 
-		$target.flexslider( {
-			selector:       '.woocommerce-product-gallery__wrapper > .woocommerce-product-gallery__image',
-			animation:      wc_single_product_params.flexslider.animation,
-			smoothHeight:   wc_single_product_params.flexslider.smoothHeight,
-			directionNav:   wc_single_product_params.flexslider.directionNav,
-			controlNav:     wc_single_product_params.flexslider.controlNav,
-			slideshow:      wc_single_product_params.flexslider.slideshow,
-			animationSpeed: wc_single_product_params.flexslider.animationSpeed,
-			animationLoop:  wc_single_product_params.flexslider.animationLoop, // Breaks photoswipe pagination if true.
-			allowOneSlide:  wc_single_product_params.flexslider.allowOneSlide,
+		var options = $.extend( {
+			selector: '.woocommerce-product-gallery__wrapper > .woocommerce-product-gallery__image',
 			start: function() {
 				$target.css( 'opacity', 1 );
 			},
 			after: function( slider ) {
 				gallery.initZoomForTarget( gallery.$images.eq( slider.currentSlide ) );
 			}
-		} );
+		}, wc_single_product_params.flexslider );
+
+		$target.flexslider( options );
 
 		// Trigger resize after main image loads to ensure correct gallery size.
 		$( '.woocommerce-product-gallery__wrapper .woocommerce-product-gallery__image:eq(0) .wp-post-image' ).one( 'load', function() {

diff --git a/assets/js/frontend/single-product.min.js b/assets/js/frontend/single-product.min.js