Merge branch 'release/1.19.5'

inc/template-tags.php

@@ -9,7 +9,7 @@
 
 if ( ! function_exists( 'siteorigin_north_display_logo' ) ) :
 /**
- * Display the logo or site title
+ * Display the logo or site title.
  */
 function siteorigin_north_display_logo() {
 	$logo = siteorigin_setting( 'branding_logo' );
@@ -43,7 +43,7 @@ function siteorigin_north_display_logo() {
 
 if ( ! function_exists( 'siteorigin_north_display_retina_logo' ) ) :
 /**
- * Display a retina ready logo
+ * Display a retina ready logo.
  */
 function siteorigin_north_display_retina_logo( $attr ) {
 	if ( current_filter() == 'wp_get_attachment_image_attributes' ) {
@@ -496,7 +496,7 @@ function siteorigin_north_entry_thumbnail() {
 
 if ( ! function_exists( 'siteorigin_north_get_video' ) ) :
 /**
- * Get the video from the current post
+ * Get the video from the current post.
  */
 function siteorigin_north_get_video() {
 	$first_url    = '';
@@ -528,7 +528,7 @@ function siteorigin_north_get_video() {
 
 if ( ! function_exists( 'siteorigin_north_filter_video' ) ) :
 /**
- * Removes the video from the post content
+ * Removes the video from the post content.
  */
 function siteorigin_north_filter_video( $content ) {
 	if ( siteorigin_north_get_video() ) {
@@ -547,7 +547,7 @@ function siteorigin_north_filter_video( $content ) {
 
 if ( ! function_exists( 'siteorigin_north_strip_gallery' ) ) :
 /**
- * Remove gallery from post content
+ * Remove gallery from post content.
  */
 function siteorigin_north_strip_gallery( $content ) {
 	preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
@@ -569,7 +569,7 @@ function siteorigin_north_strip_gallery( $content ) {
 
 if ( ! function_exists( 'siteorigin_north_get_image' ) ) :
 /**
- * Get the first image from the post content
+ * Get the first image from the post content.
  */
 function siteorigin_north_get_image() {
 	$first_image = '';

js/north.js

@@ -90,7 +90,7 @@
 			var $a = $( this );
 			var $target = $( '[name=' + this.hash.slice( 1 ) + ']' ).length ? $( '[name=' + this.hash.slice( 1 ) + ']' ) : $( $a.get( 0 ).hash );
 			if ( $target.length ) {
-				$( 'html, body' ).animate( {
+				$( 'html, body' ).stop().animate( {
 					scrollTop: $target.offset().top - headerHeight( $target )
 				}, 1000 );
 
@@ -273,7 +273,7 @@
 	sttWindowScroll();
 	$( window ).on( 'scroll', sttWindowScroll );
 	$( '#scroll-to-top' ).on( 'click', function() {
-		$( 'html,body' ).animate( { scrollTop: 0 } );
+		$( 'html,body' ).stop().animate( { scrollTop: 0 } );
 	} );
 
 	// Handle the header search.
@@ -465,7 +465,7 @@
 			var $target = $( window.location.hash );
 			if ( $target.length ) {
 				setTimeout( function() {
-					$( 'html, body' ).animate( {
+					$( 'html, body' ).stop().animate( {
 						scrollTop: $target.offset().top - headerHeight( $target, true )
 					},
 					0,

readme.txt

@@ -4,7 +4,7 @@ Contributors: siteorigin
 
 Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-menu, custom-logo, featured-images, footer-widgets, full-width-template, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
 
-Tested up to: 5.8
+Tested up to: 5.9
 Requires at least: 4.7
 Requires PHP: 5.6.20
 License: GPLv2 or later
@@ -104,6 +104,10 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.19.5 - 05 February 2022 =
+* Updated `Tested up to` tag to `5.9`.
+* Smooth Scrolling: Update to allow for animation interruption when another page jump is clicked.
+
 = 1.19.4 - 30 November 2021 =
 * Updated SiteOrigin Settings: Ensured WPML translated theme strings aren't overridden.
 

sass/style.scss

@@ -5,7 +5,7 @@ Author URI: https://siteorigin.com/
 Theme URI: https://siteorigin.com/theme/north/
 Description: Inspired by the elegant majesty and purity of the Swiss Alps and built with business owners in mind, North is the star in the SiteOrigin sky. With easy-to-use options, classic lines and a minimal feel, North feels visually limitless and technically effortless. It's fully responsive and retina ready. Some key features are its responsive menu, gorgeous animations and tight integration with all the major plugins you've come to rely on. You can use it to create a business website using SiteOrigin Page Builder and our Widgets Bundle. You can also build a full ecommerce store though North's WooCommerce integration. We offer free and premium support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
 Version: dev
-Tested up to: 5.8
+Tested up to: 5.9
 Requires at least: 4.7
 Requires PHP: 5.6.20
 License: GNU General Public License v2 or later