Branch 2.16.3 (#731)

* fix: upgrade @babel/runtime-corejs2 from 7.12.1 to 7.13.17 (#365) Snyk has created this PR to upgrade @babel/runtime-corejs2 from 7.12.1 to 7.13.17. See this package in npm: See this project in Snyk: https://app.snyk.io/org/cssjoe/project/5d219e30-bbd4-4803-80ef-bce43258a15a?utm_source=github&utm_medium=upgrade-pr * remove unused variable * fix: upgrade @wordpress/hooks from 2.10.0 to 2.12.2 (#366) Snyk has created this PR to upgrade @wordpress/hooks from 2.10.0 to 2.12.2. See this package in npm: See this project in Snyk: https://app.snyk.io/org/cssjoe/project/5d219e30-bbd4-4803-80ef-bce43258a15a?utm_source=github&utm_medium=upgrade-pr Co-authored-by: jamesros <jamesros@boldgrid.com> * fix: upgrade @wordpress/dom-ready from 2.11.0 to 2.13.2 (#367) Snyk has created this PR to upgrade @wordpress/dom-ready from 2.11.0 to 2.13.2. See this package in npm: See this project in Snyk: https://app.snyk.io/org/cssjoe/project/5d219e30-bbd4-4803-80ef-bce43258a15a?utm_source=github&utm_medium=upgrade-pr Co-authored-by: jamesros <jamesros@boldgrid.com> * fix: package.json & yarn.lock to reduce vulnerabilities (#504) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-SSH2-1656673 Co-authored-by: jamesros <jamesros@boldgrid.com> * updated yarn.lock * fix: package.json & yarn.lock to reduce vulnerabilities (#562) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-ANSIREGEX-1583908 Co-authored-by: jamesros <jamesros@boldgrid.com> * update yarn.lock * fix: package.json & yarn.lock to reduce vulnerabilities (#370) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-POSTCSS-1255640 * update yarn.lock * update puppeteer & ws * update 'i' * update chownr * updated url-parse * update follow-redirects * update moment * update readme * fix 'final private' notices * resolves #516 (#730) * resolves #401 (#729) * update version numbers and readme * specify nanoid version for postcss * fix secondary hover color display * update version numbers Co-authored-by: Snyk bot <snyk-bot@snyk.io>
BoldGrid · Sep 7, 2022 · 23f2bd7 · 23f2bd7
1 parent f056d33
commit 23f2bd7
Show file tree

Hide file tree

Showing 12 changed files with 187 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,23 @@ user guide for more information.
 
 ## Changelog ##
 
+### 2.16.3 ###
+* Bug Fix: Logos using Flex display stretch vertically on iOS [#516](https://github.com/BoldGrid/boldgrid-theme-framework/issues/516)
+* Bug Fix: Duplicate Header in Customizer related to Windows display settings [#488](https://github.com/BoldGrid/boldgrid-theme-framework/issues/488)
+* Bug Fix: WPForms email confirmation field error [#614](https://github.com/BoldGrid/boldgrid-theme-framework/issues/614)
+* Bug Fix: Conflict with PolyLang, Header/Footer Layout Controls do not function [#401](https://github.com/BoldGrid/boldgrid-theme-framework/issues/401)
+* Update: Update "postcss" dependancy from 6.0.22 -> 8.2.13 [#370](https://github.com/BoldGrid/boldgrid-theme-framework/pull/370)
+* Update: Update "snyk " dependancy from 1.338.0 -> 1.685.0 [#562](https://github.com/BoldGrid/boldgrid-theme-framework/pull/562)
+* Update: Update "@wordpress/dom-ready" dependancy from 2.11.0 -> 2.13.2 [#367](https://github.com/BoldGrid/boldgrid-theme-framework/pull/367)
+* Update: Update "@wordpress/hooks" dependancy from 2.10.0 -> 2.12.2 [#366](https://github.com/BoldGrid/boldgrid-theme-framework/pull/366)
+* Update: Update "@babel/runtime-corejs2" dependancy from 7.12.1 -> 7.13.17 [#365](https://github.com/BoldGrid/boldgrid-theme-framework/pull/365)
+* Update: Update "moment" dependancy from 2.24.0 -> 2.29.4 [f4ddfd5](https://github.com/BoldGrid/boldgrid-theme-framework/commit/f4ddfd55dbecc26f492772aa391253374a8dff54)
+* Update: Update "follow-redirects" dependacy from 1.5.9 -> 1.15.1 [399bcab](https://github.com/BoldGrid/boldgrid-theme-framework/commit/399bcab7d87c39aa138c729407b0ac322fa9af3c)
+* Update: Update "url-parse" dependancy from 1.4.3 -> 1.5.10 [e9a9eee](https://github.com/BoldGrid/boldgrid-theme-framework/commit/e9a9eee394bbce774102a7e67df78ab93bc71714)
+* Update: Update "chownr" dependancy from 1.0.1 -> 1.1.4 [1b1d681](https://github.com/BoldGrid/boldgrid-theme-framework/commit/1b1d681f06337e70da7bf79e04316031fcc02d69)
+* Update: Update "i" dependancy from 0.3.6 -> 0.3.7 [855c5d0](https://github.com/BoldGrid/boldgrid-theme-framework/commit/855c5d0e6863759372cc027c6514957f65dec023)
+* Update: Update "puppeteer" dependancy from 1.9.0 -> 1.20.0 [132f018](https://github.com/BoldGrid/boldgrid-theme-framework/commit/132f018fd79b8de7a6326dd3fa6fd991e9d91f25)
+
 ### 2.16.2 ###
 * Bug Fix: Dividing by Zero in the Header [#708](https://github.com/BoldGrid/boldgrid-theme-framework/issues/708)
 * Bug Fix: Featured Image background for Posts does not display [#717](https://github.com/BoldGrid/boldgrid-theme-framework/issues/717)

diff --git a/gulpfile.js b/gulpfile.js
@@ -206,6 +206,8 @@ gulp.task('phpDeps', function () {
     // Use locally provided FontAwesome dependency.
     .pipe(replace(/([ \t]*)wp_enqueue_script\(\s?\'kirki-fontawesome-font\',\s?\'https:\/\/use.fontawesome.com\/30858dc40a.js\',\s?array\(\),\s?\'4.0.7\',\s?(?:true|false)\s?\)\;\s?^(?:[\t ]*(?:\r?\n|\r))*/gm, "$1global $boldgrid_theme_framework;\n$1$bgtfw_configs = $boldgrid_theme_framework->get_configs();\n\n$1if ( ! class_exists( 'BoldGrid_Framework_Styles' ) ) {\n$1\trequire_once $bgtfw_configs['framework']['includes_dir'] . 'class-boldgrid-framework-styles.php';\n$1}\n\n$1$bgtfw_styles = new BoldGrid_Framework_Styles( $bgtfw_configs );\n$1$bgtfw_styles->enqueue_fontawesome();\n\n"))
 	.pipe( deleteLines( { 'filters': [ /.*sourceMappingURL=.*/i ] } ) )
+  // Change 'final private' methods to 'private'.
+  .pipe( replace( /final private function/g, 'private function' ) )
 	.pipe(gulp.dest(config.dist + '/includes/kirki') );
   // Get Kirki CSS.
   gulp.src(config.node_modules + '/kirki-toolkit/assets/**/*.{css,json}')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "boldgrid-theme-framework",
-	"version": "2.16.2",
+	"version": "2.16.3",
 	"description": "BoldGrid Theme Framework",
 	"main": "index.js",
 	"engines": {
@@ -52,7 +52,12 @@
 		"url": "https://github.com/BoldGrid/boldgrid-theme-framework.git"
 	},
 	"resolutions": {
-		"natives": "1.1.6"
+		"natives": "1.1.6",
+		"i": "^0.3.7",
+		"**/chownr": "^1.1.4",
+		"**/url-parse": "^1.5.10",
+		"**/follow-redirects": "^1.14.9",
+		"**/nanoid": "^3.1.22"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.0.0-beta.47",
@@ -110,7 +115,7 @@
 		"jshint-stylish": "^2.1.0",
 		"mini-css-extract-plugin": "^0.4.0",
 		"mkdirp": "^0.5.1",
-		"moment": "^2.24.0",
+		"moment": "^2.29.4",
 		"multislider": "https://github.com/ippontech/multiSlider.js",
 		"php-parser": "^3.0.0-prerelease.8",
 		"pkg-dir": "^3.0.0",
@@ -132,10 +137,10 @@
 		"webpack-runtime-public-path-plugin": "^1.1.2"
 	},
 	"dependencies": {
-		"@babel/runtime-corejs2": "^7.12.1",
+		"@babel/runtime-corejs2": "^7.13.17",
 		"@boldgrid/components": "^2.16.2",
-		"@wordpress/dom-ready": "^2.11.0",
-		"@wordpress/hooks": "^2.10.0",
+		"@wordpress/dom-ready": "^2.13.2",
+		"@wordpress/hooks": "^2.12.2",
 		"Buttons": "https://github.com/boldgrid/Buttons#crio-buttons",
 		"animate.css": "3.7.2",
 		"bootstrap-sass": "~3.4.1",
@@ -154,11 +159,13 @@
 		"lodash.kebabcase": "^4.1.1",
 		"lodash.lowercase": "^4.3.0",
 		"lodash.startcase": "^4.4.0",
-		"postcss": "^6.0.22",
+		"postcss": "^8.2.13",
 		"sass.js": "~0.11.1",
 		"scssphp": "https://github.com/scssphp/scssphp#v1.10.0",
 		"smartmenus": "^1.1.0",
-		"wow.js": "^1.2.2"
-	}
+		"wow.js": "^1.2.2",
+		"snyk": "^1.685.0"
+	},
+	"snyk": true
 }
 
diff --git a/src/assets/js/customizer/color/preview.js b/src/assets/js/customizer/color/preview.js
@@ -424,9 +424,8 @@ export class Preview  {
 		color    = paletteSelector.getColor( color, true );
 		subcolor = paletteSelector.getColor( subcolor, true );
 
-		let alpha    = parent.net.brehaut.Color( color );
-		let subalpha = parent.net.brehaut.Color( subcolor );
-		let css = '';
+		let alpha = parent.net.brehaut.Color( color );
+		let css   = '';
 
 		location = location.replace( /_/g, '-' );
 

diff --git a/src/assets/js/customizer/controls/bgtfw-menu-locations.js b/src/assets/js/customizer/controls/bgtfw-menu-locations.js
@@ -23,11 +23,13 @@ export default {
 			let customMenus = [];
 			Object.keys( _wpCustomizeNavMenusSettings.locationSlugMappedToName ).forEach( menu => {
 				let isActive = false;
-				if ( /.*_\d+/.test( menu ) ) {
+
+				// Only mark as active if there is a panel for it.
+				if ( /.*_\d+/.test( menu ) && api.panel( `bgtfw_menu_location_${menu}` ) ) {
 					isActive = true;
-					api.controlConstructor.nav_menu_location.prototype.updateMenuLocations( menu, isActive );
 					customMenus.push( menu );
 				}
+				api.controlConstructor.nav_menu_location.prototype.updateMenuLocations( menu, isActive );
 			} );
 			let menus = api.control( 'bgtfw_header_layout_custom' ).getConnectedMenus()
 				.map( menu => menu.replace( 'boldgrid_menu_', '' ) );
@@ -66,6 +68,11 @@ export default {
 								if ( /.*_\d+/.test( menu ) ) {
 									isActive = true;
 								}
+
+								// If there is no panel for this location, mark inactive.
+								if ( ! api.panel( `bgtfw_menu_location_${menu}` ) ) {
+									isActive = false;
+								}
 								api.controlConstructor.nav_menu_location.prototype.updateMenuLocations( menu, isActive );
 							} );
 						} );
@@ -96,6 +103,11 @@ export default {
 		}
 		let panel = api.panel( `bgtfw_menu_location_${ locationId }` );
 
+		// If there is no panel for this location quit.
+		if ( ! panel ) {
+			return;
+		}
+
 		// Force the active panel state to read JS state set with isActive() and ignore server response.
 		panel.active.validate = isActive;
 

diff --git a/src/assets/js/customizer/controls/bgtfw-sortable-accordion.js b/src/assets/js/customizer/controls/bgtfw-sortable-accordion.js
@@ -568,6 +568,11 @@ export default {
 			if ( 'sticky-header' === this.params.location && ! location.includes( 'sticky' ) ) {
 				return;
 			}
+
+			// Do not include menu locations without a customizer panel.
+			if ( ! api.panel( `bgtfw_menu_location_${location}` ) ) {
+				return;
+			}
 			attr = `boldgrid_menu_${ location }` === type ? 'selected' : '';
 			markup += `<option value="boldgrid_menu_${ location }"${ attr }>${ name }</option>`;
 		} );
@@ -886,7 +891,16 @@ export default {
 	 * @since 2.0.3
 	 */
 	getAllMenuActions() {
-		return Object.keys( window._wpCustomizeNavMenusSettings.locationSlugMappedToName ).map( item => `boldgrid_menu_${item}` );
+		var menuLocations = [];
+
+		// We only want to list menus that have an associated panel.
+		$.each( window._wpCustomizeNavMenusSettings.locationSlugMappedToName, ( location ) => {
+			if ( api.panel( `bgtfw_menu_location_${location}` ) ) {
+				menuLocations.push( location );
+			}
+		} );
+
+		return menuLocations.map( location => `bgtfw_menu_${ location }` );
 	},
 
 	/**

diff --git a/src/assets/js/customizer/header-layout/header-layout.js b/src/assets/js/customizer/header-layout/header-layout.js
@@ -1,5 +1,8 @@
 const controlApi = parent.wp.customize;
 
+// Sometimes underscore is needed, when the parent / parent.window are not defined.
+const underscore = parent.window._;
+
 parent.window.BOLDGRID.colWidthSliders = parent.window.BOLDGRID.colWidthSliders ?
 			parent.window.BOLDGRID.colWidthSliders :
 			{};
@@ -571,7 +574,7 @@ export class HeaderLayout  {
 				this.brandingNotices( controlApi( 'bgtfw_header_preset_branding' )(), controlApi.control( 'bgtfw_header_preset_branding' ) );
 				controlApi.control( 'bgtfw_header_preset' ).container.find( '.bgtfw_header_presetcustom' ).on( 'click', () => {
 					controlApi.section( 'bgtfw_header_layout_advanced' ).activate();
-					window._.defer( () => {
+					underscore.defer( () => {
 						controlApi.control( 'bgtfw_header_layout_position' ).focus();
 					} );
 				} );
@@ -928,7 +931,7 @@ export class HeaderLayout  {
 
 				if ( 'custom' === stickyHeaderPreset ) {
 					controlApi.section( 'bgtfw_sticky_header_layout_advanced' ).activate();
-					window._.defer( () => {
+					underscore.defer( () => {
 						controlApi.control( 'bgtfw_sticky_header_layout_custom' ).focus();
 					} );
 					requestData.customHeaderLayout = controlApi( 'bgtfw_sticky_header_layout_custom' )();

diff --git a/src/assets/js/customizer/menus/extend-title.js b/src/assets/js/customizer/menus/extend-title.js
@@ -25,6 +25,11 @@ export class SectionExtendTitle {
 	 */
 	_bindMenuPanels() {
 		for ( const location of Object.keys( this.menus ) ) {
+
+			// Do not try to bind panels that do not exist.
+			if ( ! api.panel( `bgtfw_menu_location_${location}` ) ) {
+				continue;
+			}
 			api.panel( `bgtfw_menu_location_${location}` ).expanded.bind( () => this.updateTitle( location ) );
 			api( `bgtfw_menu_hamburger_${location}`, ( value ) => value.bind( () => this.updateTitle( location ) ) );
 			api( `bgtfw_menu_hamburger_${location}_toggle`, ( value ) => value.bind( () => this.updateTitle( location ) ) );

diff --git a/src/assets/js/customizer/menus/hover-background-toggle.js b/src/assets/js/customizer/menus/hover-background-toggle.js
@@ -74,7 +74,13 @@ export class HoverBackgroundToggle {
 	 * @since 2.0.0
 	 */
 	_onLoad() {
-		this.menus = window._wpCustomizeNavMenusSettings.locationSlugMappedToName;
+		var menus  = window._wpCustomizeNavMenusSettings.locationSlugMappedToName;
+		this.menus = {};
+		Object.keys( menus ).forEach( ( menu ) => {
+			if ( api.panel( `bgtfw_menu_location_${menu}` ) ) {
+				this.menus[ menu ] = menus[ menu ];
+			}
+		} );
 		this._bindHoverBackgroundToggle();
 	}
 }

diff --git a/src/assets/scss/boldgrid/_header.scss b/src/assets/scss/boldgrid/_header.scss
@@ -101,6 +101,12 @@
 	.col-xs-full-width {
 		width: 100%;
 	}
+	@supports (-webkit-touch-callout: none) {
+		a.bgc_logo.custom-logo-link {
+			flex-direction: column;
+			align-items: center;
+		}
+	}
 }
 
 @media only screen and (min-width: 768px ) and (max-width: 991px) {

diff --git a/src/boldgrid-theme-framework.php b/src/boldgrid-theme-framework.php
@@ -3,7 +3,7 @@
  * Plugin Name: BoldGrid Theme Framework
  * Plugin URI: https://www.boldgrid.com/docs/configuration-file
  * Description: BoldGrid Theme Framework is a library that allows you to easily make BoldGrid themes. Please see our reference guide for more information: https://www.boldgrid.com/docs/configuration-file
- * Version: 2.16.2
+ * Version: 2.16.3
  * Author: BoldGrid.com <wpb@boldgrid.com>
  * Author URI: https://www.boldgrid.com/
  * Text Domain: bgtfw