Merge branch 'release/1.17.18'

siteorigin · Dec 30, 2020 · 9d1547b · 9d1547b
2 parents 65509d4 + 8f4a458
commit 9d1547b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/build b/build
diff --git a/inc/settings b/inc/settings
diff --git a/js/jquery.flexslider.js b/js/jquery.flexslider.js
@@ -275,7 +275,7 @@
 
           methods.controlNav.active();
 
-          slider.controlNavScaffold.on('a, img', eventType, function(event) {
+          slider.controlNavScaffold.on( eventType, 'a, img', function(event) {
             event.preventDefault();
 
             if (watchedEvent === "" || watchedEvent === event.type) {

diff --git a/js/north.js b/js/north.js
@@ -312,7 +312,7 @@
 
 	// Gallery format image slider.
 	$( document ).ready( function() {
-		if ( $.isFunction( $.fn.flexslider ) ) {
+		if ( typeof $.fn.flexslider == 'function' ) {
 			$( '.gallery-format-slider' ).flexslider( {
 				animation: "slide",
 			} );

diff --git a/readme.txt b/readme.txt
@@ -103,6 +103,10 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.17.18 - 30 December 2020 =
+* WooCommerce: Added single product thumbnail navigation support for jQuery 3.5.
+* Updated the SiteOrigin Settings framework.
+
 = 1.17.17 - 17 November 2020 =
 * Developer: Added support for jQuery 3.5.
 

diff --git a/sass/style.scss b/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.5
+Tested up to: 5.6
 Requires at least: 4.7
 Requires PHP: 5.6.20
 License: GNU General Public License v2 or later

diff --git a/style.css b/style.css
+47 −0		inc/lazy_load_exclude_logo.php
+1 −1		inc/page_settings.php
+9 −0		settings.php