Merge branch 'release/1.3.10'

admin/about/page-github.php

@@ -1,6 +1,6 @@
 <h3><?php esc_html_e( 'Actively Developed on Github', 'polestar' ); ?></h3>
 <img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
 <p>
-	<?php printf( esc_html__( "Polestar is actively %sdeveloped on Github%s.", 'polestar' ), '<a href="https://github.com/purothemes/polestar">', '</a>' ); ?>
+	<?php printf( esc_html__( "Polestar is actively %sdeveloped on Github%s.", 'polestar' ), '<a href="https://github.com/purothemes/polestar" target="_blank">', '</a>' ); ?>
 	<?php esc_html_e( "You can follow commits, open issues and make contributions yourself.", 'polestar' ); ?>
 </p>

admin/about/page-page-builder.php

@@ -1,5 +1,5 @@
 <h3><?php esc_html_e( 'Enhanced by Page Builder', 'polestar' ); ?></h3>
 <p>
-	<?php printf( esc_html__( "Polestar integrates, beautifully, with %sPage Builder by SiteOrigin%s.", 'polestar' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ); ?>
+	<?php printf( esc_html__( "Polestar integrates, beautifully, with %sPage Builder by SiteOrigin%s.", 'polestar' ), '<a href="https://siteorigin.com/page-builder/" target="_blank">', '</a>' ); ?>
 	<?php esc_html_e( 'This powerful plugin gives you full drag and drop capabilities right inside Polestar.', 'polestar' ); ?>
 </p>

admin/about/page-support.php

@@ -1,4 +1,4 @@
 <h3><?php esc_html_e( 'Professional Support', 'polestar' ); ?></h3>
 <p>
-	<?php printf( esc_html__( "Keep your project moving forward with quick support on our %sfree support forums%s. Beginner or advanced user, we're here to help.", 'polestar' ), '<a href="https://purothemes.com/support/forum/polestar-theme/">', '</a>' ); ?>
+	<?php printf( esc_html__( "Keep your project moving forward with quick support on our %sfree support forums%s. Beginner or advanced user, we're here to help.", 'polestar' ), '<a href="https://purothemes.com/support/forum/polestar-theme/" target="_blank">', '</a>' ); ?>
 </p>

comments.php

@@ -43,7 +43,7 @@
 				);
 			}
 			?>
-		</h2><!--. comments-title -->
+		</h2><!-- .comments-title -->
 
 		<?php 
 			$args = array(

inc/extras-options.php

@@ -100,7 +100,7 @@ function polestar_about_page( $about ) {
 	$about['review'] = true;
 
 	$about['no_video'] = true;
-	
+
 	$about['video_url'] = 'https://purothemes.com/themes/polestar/';
 
 	$about['description'] = esc_html__( 'Lead the way with Polestar. It\'s fast loading, responsive, lightweight and flexible design is perfectly suited for building dynamic pages with SiteOrigin\'s Page Builder and selling with WooCommerce.', 'polestar' );

inc/extras.php

@@ -130,24 +130,6 @@ function polestar_post_class_filter( $classes ) {
 endif;
 add_filter( 'post_class', 'polestar_post_class_filter' );
 
-if ( ! function_exists( 'polestar_premium_setup' ) ) :
-/**
- * Polestar upsell notice.
- */
-function polestar_upsell_notice() {
-	wp_enqueue_script( 'polestar-customizer-upsell', get_template_directory_uri() . '/js/polestar-upsell.js', array(), '1.0.0', true );
-	wp_localize_script(
-		'polestar-customizer-upsell',
-		'polestar10n',
-		array(
-			'polestarURL'   => esc_html__( 'https://purothemes.com/themes/polestar/', 'polestar' ),
-			'polestarLabel' => esc_html__( 'Buy Premium Version', 'polestar' ),
-		)
-	);
-}
-add_action( 'customize_controls_enqueue_scripts', 'polestar_upsell_notice' );
-endif;
-
 /**
  * Add our SiteOrigin Premium affiliate ID.
  */

js/jquery.theme.js

@@ -1,7 +1,7 @@
 /**
  * File jquery.theme.js.
  *
- * Handles the primary JavaScript functions for the theme.
+ * Handles the primary JavaScript functions for the theme - (c) Puro, freely distributable under the terms of the GPL 2.0 license. 
  */
 
 /* globals jQuery, polestar */
@@ -32,9 +32,9 @@ jQuery( function( $ ) {
 		} );
 	} );
 
-	// Setup FitVids for entry content, Page Builder by SiteOrigin and WooCommerce. Ignore Tableau.
+	// Setup FitVids for entry content, video post formats, SiteOrigin panels and WooCommerce pages. Ignore Tableau.
 	if ( typeof $.fn.fitVids !== 'undefined' ) {
-		$( '.entry-content, .entry-content .panel, .woocommerce #main' ).fitVids( { ignore: '.tableauViz' } );
+		$( '.entry-content, .entry-content .panel, .entry-video, .woocommerce #main' ).fitVids( { ignore: '.tableauViz' } );
 	}
 
 	// FlexSlider.
@@ -126,7 +126,7 @@ jQuery( function( $ ) {
 	} );
 
 	// Main menu current menu item indication.
-	jQuery( document ).ready( function( $ ) {
+	$( document ).ready( function( $ ) {
 		if ( window.location.hash ) {
 			return;
 		} else {
@@ -172,19 +172,22 @@ jQuery( function( $ ) {
 	}
 
 	// Smooth scroll from internal page anchors.
-	var adminBarHeight = $( '#wpadminbar' ).outerHeight(),
-		isAdminBar = $( 'body' ).hasClass( 'admin-bar' ),
-		isStickyHeader = $( 'header' ).hasClass( 'sticky' ),
-		headerHeight;
-
-	// Header height. 2px to account for header shadow.
-	if ( isStickyHeader && isAdminBar && jQuery( window ).width() > 600 ) { // From 600px the admin bar isn't sticky so we shouldn't take its height into account.
-		headerHeight = adminBarHeight + $( 'header' ).outerHeight() - 2;
-	} else if ( isStickyHeader ) {
-		headerHeight = $( 'header' ).outerHeight() - 2;
-	} else {
-		headerHeight = 0;
-	}
+	headerHeight = function() {
+		var adminBarHeight = $( '#wpadminbar' ).outerHeight(),
+			isAdminBar = $( 'body' ).hasClass( 'admin-bar' ),
+			isStickyHeader = $( 'header' ).hasClass( 'sticky' ),
+			headerHeight;
+
+		// Header height. 1px to account for header shadow.
+		if ( isStickyHeader && isAdminBar && $( window ).width() > 600 ) { // From 600px the admin bar isn't sticky so we shouldn't take its height into account.
+			headerHeight = adminBarHeight + $( 'header' ).outerHeight() - 1;
+		} else if ( isStickyHeader ) {
+			headerHeight = $( 'header' ).outerHeight() - 1;
+		} else {
+			headerHeight = 0;
+		}
+		return headerHeight;
+	};
 
 	$.fn.polestarSmoothScroll = function() {
 
@@ -199,37 +202,48 @@ jQuery( function( $ ) {
 			var alink   = this;                // This button pressed.
 
 			// Check if there is a section that had same id as the button pressed.
-			if ( jQuery( '.panel-grid [id*=' + idName + ']' ).length > 0 ) {
-				jQuery( '#site-navigation .current' ).removeClass('current');
-				jQuery( alink).parent( 'li' ).addClass( 'current' );
+			if ( $( '.panel-grid [id*=' + idName + ']' ).length > 0 ) {
+				$( '#site-navigation .current' ).removeClass( 'current' );
+				$( alink ).parent( 'li' ).addClass( 'current' );
 			} else {
-				jQuery( '#site-navigation .current' ).removeClass( 'current' );
+				$( '#site-navigation .current' ).removeClass( 'current' );
 			}
 			if ( location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname ) {
-				var target = jQuery( this.hash );
-				target = target.length ? target : jQuery( '[name=' + this.hash.slice( 1 ) +']' );
+				var target = $( this.hash );
+				target = target.length ? target : $( '[name=' + this.hash.slice( 1 ) +']' );
 				if ( target.length ) {
-					jQuery( 'html, body' ).animate( {
-						scrollTop: target.offset().top - headerHeight
-					}, 1200 );
+					$( 'html, body' ).animate( {
+						scrollTop: target.offset().top - headerHeight()
+					},
+					{
+						duration: 1200,
+						start: function() {
+							$( 'html, body' ).on( 'wheel touchmove', function() {
+								$( 'html, body' ).stop().off( 'wheel touchmove' );
+							} );
+						},
+						complete: function() {
+							$( 'html, body' ).finish().off( 'wheel touchmove' );
+						},
+					} );
 					return false;
 				}
 			}
 		} );
 	};
 
-	jQuery( window ).load( function() {
+	$( window ).load( function() {
 		$( '#site-navigation a[href*="#"]:not([href="#"]), .comments-link a[href*="#"]:not([href="#"]), .puro-scroll[href*="#"]:not([href="#"])' ).polestarSmoothScroll();
 	} );
 
 	// Adjust for sticky header when linking from external anchors.
-	jQuery( window ).load( function() {
+	$( window ).load( function() {
 
 		if ( location.pathname.replace( /^\//,'' ) == window.location.pathname.replace( /^\//,'' ) && location.hostname == window.location.hostname ) {
-			var target = jQuery( window.location.hash );
+			var target = $( window.location.hash );
 			if ( target.length ) {
-				jQuery( 'html, body' ).animate( {
-					scrollTop: target.offset().top - headerHeight
+				$( 'html, body' ).animate( {
+					scrollTop: target.offset().top - headerHeight()
 				}, 0 );
 				return false;
 			}
@@ -240,44 +254,44 @@ jQuery( function( $ ) {
 	function polestarSelected() {
 
 		// Cursor position.
-		var scrollTop = jQuery( window ).scrollTop();
+		var scrollTop = $( window ).scrollTop();
 
 		// Used for checking if the cursor is in one section or not.
 		var isInOneSection = 'no';
 
 		// For all sections check if the cursor is inside a section.
-		jQuery( '.panel-row-style' ).each( function() {
+		$( '.panel-row-style' ).each( function() {
 
 			// Section ID.
-			var thisID = '#' + jQuery( this ).attr( 'id' );
+			var thisID = '#' + $( this ).attr( 'id' );
 
-			// Distance between top and our section. Minus 2px to compensate for an extra pixel produced when a Page Builder row bottom margin is set to 0.
-			var offset = jQuery( this ).offset().top - 2;
+			// Distance between top and our section. Minus 1px to compensate for an extra pixel produced when a Page Builder row bottom margin is set to 0.
+			var offset = $( this ).offset().top - 1;
 
 			// Section height.
-			var thisHeight = jQuery( this ).outerHeight();
+			var thisHeight = $( this ).outerHeight();
 
 			// Where the section begins.
-			var thisBegin = offset - headerHeight;
+			var thisBegin = offset - headerHeight();
 
 			// Where the section ends.
-			var thisEnd = offset + thisHeight - headerHeight;
+			var thisEnd = offset + thisHeight - headerHeight();
 
 			// If position of the cursor is inside of the this section.
 			if ( scrollTop >= thisBegin && scrollTop <= thisEnd ) {
 				isInOneSection = 'yes';
-				jQuery( '#site-navigation .current' ).removeClass( 'current' );
+				$( '#site-navigation .current' ).removeClass( 'current' );
 				// Find the menu button with the same ID section.
-				jQuery( '#site-navigation a[href$="' + thisID + '"]' ).parent( 'li' ).addClass( 'current' );	// Find the menu button with the same ID section.
+				$( '#site-navigation a[href$="' + thisID + '"]' ).parent( 'li' ).addClass( 'current' ); // Find the menu button with the same ID section.
 				return false;
 			}
 			if ( isInOneSection === 'no' ) {
-				jQuery( '#site-navigation .current' ).removeClass( 'current' );
+				$( '#site-navigation .current' ).removeClass( 'current' );
 			}
 		} );
 	}
 
-	jQuery( window ).on( 'scroll', polestarSelected );
+	$( window ).on( 'scroll', polestarSelected );
 
 	// Mobile menu.
 	var $mobileMenu = false;
@@ -299,7 +313,7 @@ jQuery( function( $ ) {
 			if ( $( '.main-navigation .shopping-cart' ).length ) {
 				$mobileMenu.append( $( '.main-navigation .shopping-cart .shopping-cart-link' ).clone() );
 			}
-			
+
 			$mobileMenu.find( '#primary-menu' ).show().css( 'opacity', 1 );
 			$mobileMenu.find( '.menu-item-has-children > a' ).addClass( 'has-dropdown' );
 			$mobileMenu.find( '.page_item_has_children > a' ).addClass( 'has-dropdown' );

loops/loop-blog.php

@@ -31,8 +31,8 @@
 	endwhile;
 
 	the_posts_pagination( array( 
-		'prev_text' => '<span class="icon-long-arrow-left"></span>', 
-		'next_text' => '<span class="icon-long-arrow-right"></span>' 
+		'prev_text' => '<span class="icon-long-arrow-left"></span>',
+		'next_text' => '<span class="icon-long-arrow-right"></span>'
 	) );
 
 else :

readme.txt

@@ -150,6 +150,12 @@ Released under [GPL version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0
 
 == Changelog ==
 
+= 1.3.10 - 30 September 2019 =
+* Ensured FitVids targets `entry-video` for video post format.
+* Changed sticky header height calculation to allow for re-calculation.
+* Fixed smooth scroll sticky anchor when mobile menu in use.
+* Minor about page and code formatting fixes.
+
 = 1.3.9 - 02 September 2019 =
 * Added new core `wp_body_open` hook.
 * Minor WC product data tab styling adjustments.

sass/site/primary/_comments.scss

@@ -32,7 +32,7 @@
 
 		.avatar-container {
 			float: left;
-			
+
 			@media (max-width: 480px) {
 				display: none;
 			}
@@ -229,7 +229,7 @@
 		clear: both;
 		margin: 0 0 8px;
 		overflow: auto;
-		
+
 		&:last-of-type {
 			margin-bottom: 0;
 		}

template-parts/content-page.php

@@ -16,7 +16,7 @@
 		<div class="entry-thumbnail">
 			<?php the_post_thumbnail(); ?>
 		</div>
-	<?php endif; ?>	
+	<?php endif; ?>
 
 	<?php if ( puro_page_setting( 'page_title' ) ) : ?>
 		<header class="entry-header">