Merge branch 'release/1.17.3'

siteorigin · Jun 12, 2021 · 78501d6 · 78501d6
2 parents 774e21b + 676be89
commit 78501d6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/build b/build
diff --git a/functions.php b/functions.php
@@ -354,6 +354,12 @@ function vantage_scripts() {
 
 	if ( siteorigin_setting( 'layout_fitvids' ) ) {
 		wp_enqueue_script( 'jquery-fitvids' , get_template_directory_uri() . '/js/jquery.fitvids' . SITEORIGIN_THEME_JS_PREFIX . '.js' , array('jquery'), '1.0', $in_footer );
+		wp_localize_script(
+			'vantage-main',
+			'vantage', array(
+				'fitvids' => true,
+			)
+		);
 	}
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {

diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php
@@ -87,7 +87,7 @@ function css() {
 		// Start by importing Google web fonts
 		$return = '<style type="text/css" id="customizer-css">';
 
-		if ( apply_filters( 'vanage_import_google_fonts', true ) ) {
+		if ( apply_filters( 'vantage_import_google_fonts', true ) ) {
 			$import = array();
 			foreach ( $this->google_fonts as $font ) {
 				$import[ ] = urlencode( $font[ 0 ] ) . ':' . $font[ 1 ];

diff --git a/inc/customizer/js/admin.js b/inc/customizer/js/admin.js
@@ -2,24 +2,24 @@
 /* globals jQuery, wp, soCustomizeAdmin, confirm */
 
 wp.customize.bind( 'ready', function( value ){
-    var $ = jQuery;
+	var $ = jQuery;
 
-    var button = null;
-    $('#accordion-panel-siteorigin_theme_settings ').one('expanded', function(){
-        var buttonWrapper = $("<div id='siteorigin-customizer-reset'></div>")
-            .appendTo( $('#accordion-panel-siteorigin_theme_settings .accordion-section-content.description') )
-            .append(
-                $("<a class='reset-customizations button-secondary'></a>")
-                    .html( soCustomizeAdmin.button )
-                    .attr( 'href', soCustomizeAdmin.action )
-            );
+	var button = null;
+	$('#accordion-panel-siteorigin_theme_settings ').one('expanded', function(){
+		var buttonWrapper = $("<div id='siteorigin-customizer-reset'></div>")
+			.appendTo( $('#accordion-panel-siteorigin_theme_settings .accordion-section-content.description') )
+			.append(
+				$("<a class='reset-customizations button-secondary'></a>")
+					.html( soCustomizeAdmin.button )
+					.attr( 'href', soCustomizeAdmin.action )
+			);
 
-        buttonWrapper.find( 'a.reset-customizations' ).on( 'click', function( e ) {
-            if( !confirm( soCustomizeAdmin.confirm ) ) {
-                e.preventDefault();
-            }
-        });
-    });
+		buttonWrapper.find( 'a.reset-customizations' ).on( 'click', function( e ) {
+			if( !confirm( soCustomizeAdmin.confirm ) ) {
+				e.preventDefault();
+			}
+		});
+	});
 
 	$( '#accordion-panel-theme_settings' ).one( 'expanded', function () {
 		var toggleSliderStretch = function ( selectedSlider ) {

diff --git a/js/jquery.theme-main.js b/js/jquery.theme-main.js
@@ -13,7 +13,7 @@ jQuery ( function( $ ) {
 	} );
 
 	// Setup FitVids for entry content, video post format, Panels, WooCommerce pages, masthead widget area and the header sidebar.
-	if ( typeof $.fn.fitVids !== 'undefined' ) {
+	if ( typeof $.fn.fitVids !== 'undefined' && typeof vantage !== 'undefined' && typeof vantage.fitvids ) {
 		$( '.entry-content, .entry-content .panel, .entry-video, .woocommerce #main, #masthead-widgets, #header-sidebar' ).fitVids( { ignore: '.tableauViz' } );
 	}
 

diff --git a/readme.txt b/readme.txt
@@ -106,6 +106,9 @@ This theme makes use of the SiteOrigin Settings Framework contained in the /inc
 
 == Changelog ==
 
+= 1.17.3 - 12 June 2021 =
+* Only setup FitVids if enabled in Theme Settings. Ensures better compatibility with other plugins loading FitVids for fluid width video embeds.
+
 = 1.17.2 - 25 April 2021 =
 * Resolved Post Carousel post loop template notice.
 * WooCommerce: Increased the cart quantity field width.