Merge pull request #671 from brainstormforce/release-candidate

Build: Release PR Release candidate to Master PR for version 1.6.14
brainstormforce · May 11, 2023 · e6ea5ae · e6ea5ae
2 parents fbaed47 + 5849308
commit e6ea5ae
Show file tree

Hide file tree

Showing 9 changed files with 21,702 additions and 15,331 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,31 +5,37 @@ on: pull_request
 jobs:
   CI:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node: [ 14.15 ]
+        php: ['7.4']
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: ${{ matrix.php }}
           coverage: none
           tools: composer
-
-      - name: Use desired version of NodeJS
-        uses: actions/setup-node@v3
-        with:
-            node-version: 14.15
-            cache: 'npm'
-
-      - name: Composer Install
-        uses: ramsey/composer-install@v1
+
+      - name: Install composer dependencies
+        run: composer config github-oauth.github.com ${{ secrets.PRIVATE_ACCESS_TOKEN }} && composer install --prefer-dist --no-suggest --no-progress
 
       - name: PHPCS check
         if: always()
         uses: chekalsky/phpcs-action@v1
         with:
           phpcs_bin_path: './vendor/bin/phpcs'
+
+      - name: Use desired version of NodeJS
+        uses: actions/setup-node@v3
+        with:
+            node-version: ${{ matrix.node }}
+            cache: 'npm'
 
       - name: npm install, build
         run: npm ci

diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 # Elementor Header & Footer Builder #
-**Contributors:** [brainstormforce](https://profiles.wordpress.org/brainstormforce/), [nikschavan](https://profiles.wordpress.org/nikschavan/)  
-**Tags:** elementor, header footer builder, header template, footer template, elementor widget, WordPress header, WordPress footer, elementor menu, website header design, footer design, blocks  
-**Donate link:** https://www.paypal.me/BrainstormForce  
-**Requires at least:** 4.4  
-**Requires PHP:** 5.4  
-**Tested up to:** 6.2 
-**Stable tag:** 1.6.13  
-**License:** GPLv2 or later  
-**License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
+**Contributors:** [brainstormforce](https://profiles.wordpress.org/brainstormforce/), [nikschavan](https://profiles.wordpress.org/nikschavan/)
+**Tags:** elementor, header footer builder, header template, footer template, elementor widget, WordPress header, WordPress footer, elementor menu, website header design, footer design, blocks
+**Donate link:** https://www.paypal.me/BrainstormForce
+**Requires at least:** 4.4
+**Requires PHP:** 5.4
+**Tested up to:** 6.2
+**Stable tag:** 1.6.14
+**License:** GPLv2 or later
+**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
 
 Create Header, Footer and Blocks for your WordPress website using Elementor Page Builder for free.
 
@@ -138,6 +138,10 @@ This same applies when you are creating your Header/Footer using this plugin.
 
 ## Changelog ##
 
+### 1.6.14 ###
+- Improvement: Compatibility with Elementor version 3.13 and Elementor Pro version 3.13
+- Fix: Navigation Menu - Accessibility error corrected for [aria-hidden="true"] attribute.
+
 ### 1.6.13 ###
 - Compatibility with Elementor version 3.7.2 and Elementor Pro version 3.7.3.
 

diff --git a/header-footer-elementor.php b/header-footer-elementor.php
@@ -7,14 +7,14 @@
  * Author URI:  https://www.brainstormforce.com/
  * Text Domain: header-footer-elementor
  * Domain Path: /languages
- * Version: 1.6.13
- * Elementor tested up to: 3.7.2
- * Elementor Pro tested up to: 3.7.3
+ * Version: 1.6.14
+ * Elementor tested up to: 3.13
+ * Elementor Pro tested up to: 3.13
  *
  * @package         header-footer-elementor
  */
 
-define( 'HFE_VER', '1.6.13' );
+define( 'HFE_VER', '1.6.14' );
 define( 'HFE_FILE', __FILE__ );
 define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HFE_URL', plugins_url( '/', __FILE__ ) );

diff --git a/inc/js/frontend.js b/inc/js/frontend.js
@@ -167,8 +167,16 @@
   		$scope.find( '.parent-has-child .hfe-has-submenu-container a').attr( 'aria-haspopup', 'true' );
   		$scope.find( '.parent-has-child .hfe-has-submenu-container a').attr( 'aria-expanded', 'false' );
 
-  		$scope.find( '.hfe-nav-menu__toggle').attr( 'aria-haspopup', 'true' );
-  		$scope.find( '.hfe-nav-menu__toggle').attr( 'aria-expanded', 'false' );
+		var hef_navmenu_toggle = $scope.find( '.hfe-nav-menu__toggle' );
+		hef_navmenu_toggle.attr( 'aria-haspopup', 'true' );
+		hef_navmenu_toggle.attr( 'aria-expanded', 'false' );
+
+		if ( window.matchMedia( "( max-width: 1024px )" ).matches && $( '.elementor-element-' + id ).hasClass('hfe-nav-menu__breakpoint-tablet') ) {
+			hef_navmenu_toggle.find('i').attr('aria-hidden', 'false');
+		}
+		if ( window.matchMedia( "( max-width: 768px )" ).matches && $( '.elementor-element-' + id ).hasClass('hfe-nav-menu__breakpoint-mobile') ) {
+			hef_navmenu_toggle.find('i').attr('aria-hidden', 'false');
+		}
 
   		// End of accessibility functions
 

diff --git a/inc/widgets-manager/widgets/class-navigation-menu.php b/inc/widgets-manager/widgets/class-navigation-menu.php
@@ -1147,7 +1147,7 @@ protected function register_dropdown_content_controls() {
 							'type'      => Controls_Manager::COLOR,
 							'default'   => '',
 							'selectors' => [
-								'{{WRAPPER}} .sub-menu a.hfe-sub-menu-item, 
+								'{{WRAPPER}} .sub-menu a.hfe-sub-menu-item,
 								{{WRAPPER}} .elementor-menu-toggle,
 								{{WRAPPER}} nav.hfe-dropdown li a.hfe-menu-item,
 								{{WRAPPER}} nav.hfe-dropdown li a.hfe-sub-menu-item,
@@ -1190,7 +1190,7 @@ protected function register_dropdown_content_controls() {
 							'type'      => Controls_Manager::COLOR,
 							'default'   => '',
 							'selectors' => [
-								'{{WRAPPER}} .sub-menu a.hfe-sub-menu-item:hover, 
+								'{{WRAPPER}} .sub-menu a.hfe-sub-menu-item:hover,
 								{{WRAPPER}} .elementor-menu-toggle:hover,
 								{{WRAPPER}} nav.hfe-dropdown li a.hfe-menu-item:hover,
 								{{WRAPPER}} nav.hfe-dropdown li a.hfe-sub-menu-item:hover,
@@ -1233,7 +1233,7 @@ protected function register_dropdown_content_controls() {
 						'type'      => Controls_Manager::COLOR,
 						'default'   => '',
 						'selectors' => [
-							'{{WRAPPER}} .sub-menu .menu-item.current-menu-item a.hfe-sub-menu-item.hfe-sub-menu-item-active,	
+							'{{WRAPPER}} .sub-menu .menu-item.current-menu-item a.hfe-sub-menu-item.hfe-sub-menu-item-active,
 							{{WRAPPER}} nav.hfe-dropdown .menu-item.current-menu-item a.hfe-menu-item,
 							{{WRAPPER}} nav.hfe-dropdown .menu-item.current-menu-ancestor a.hfe-menu-item,
 							{{WRAPPER}} nav.hfe-dropdown .sub-menu .menu-item.current-menu-item a.hfe-sub-menu-item.hfe-sub-menu-item-active
@@ -1250,7 +1250,7 @@ protected function register_dropdown_content_controls() {
 						'type'      => Controls_Manager::COLOR,
 						'default'   => '',
 						'selectors' => [
-							'{{WRAPPER}} .sub-menu .menu-item.current-menu-item a.hfe-sub-menu-item.hfe-sub-menu-item-active,	
+							'{{WRAPPER}} .sub-menu .menu-item.current-menu-item a.hfe-sub-menu-item.hfe-sub-menu-item-active,
 							{{WRAPPER}} nav.hfe-dropdown .menu-item.current-menu-item a.hfe-menu-item,
 							{{WRAPPER}} nav.hfe-dropdown .menu-item.current-menu-ancestor a.hfe-menu-item,
 							{{WRAPPER}} nav.hfe-dropdown .sub-menu .menu-item.current-menu-item a.hfe-sub-menu-item.hfe-sub-menu-item-active' => 'background-color: {{VALUE}}',
@@ -1284,7 +1284,7 @@ protected function register_dropdown_content_controls() {
 				Group_Control_Border::get_type(),
 				[
 					'name'     => 'dropdown_border',
-					'selector' => '{{WRAPPER}} nav.hfe-nav-menu__layout-horizontal .sub-menu, 
+					'selector' => '{{WRAPPER}} nav.hfe-nav-menu__layout-horizontal .sub-menu,
 							{{WRAPPER}} nav:not(.hfe-nav-menu__layout-horizontal) .sub-menu.sub-menu-open,
 							{{WRAPPER}} nav.hfe-dropdown .hfe-nav-menu,
 						 	{{WRAPPER}} nav.hfe-dropdown-expandible .hfe-nav-menu',
@@ -1446,7 +1446,7 @@ protected function register_dropdown_content_controls() {
 						'dashed' => __( 'Dashed', 'header-footer-elementor' ),
 					],
 					'selectors'   => [
-						'{{WRAPPER}} .sub-menu li.menu-item:not(:last-child), 
+						'{{WRAPPER}} .sub-menu li.menu-item:not(:last-child),
 						{{WRAPPER}} nav.hfe-dropdown li.menu-item:not(:last-child),
 						{{WRAPPER}} nav.hfe-dropdown-expandible li.menu-item:not(:last-child)' => 'border-bottom-style: {{VALUE}};',
 					],
@@ -1459,7 +1459,7 @@ protected function register_dropdown_content_controls() {
 					'type'      => Controls_Manager::COLOR,
 					'default'   => '#c4c4c4',
 					'selectors' => [
-						'{{WRAPPER}} .sub-menu li.menu-item:not(:last-child), 
+						'{{WRAPPER}} .sub-menu li.menu-item:not(:last-child),
 						{{WRAPPER}} nav.hfe-dropdown li.menu-item:not(:last-child),
 						{{WRAPPER}} nav.hfe-dropdown-expandible li.menu-item:not(:last-child)' => 'border-bottom-color: {{VALUE}};',
 					],
@@ -1484,7 +1484,7 @@ protected function register_dropdown_content_controls() {
 						'unit' => 'px',
 					],
 					'selectors' => [
-						'{{WRAPPER}} .sub-menu li.menu-item:not(:last-child), 
+						'{{WRAPPER}} .sub-menu li.menu-item:not(:last-child),
 						{{WRAPPER}} nav.hfe-dropdown li.menu-item:not(:last-child),
 						{{WRAPPER}} nav.hfe-dropdown-expandible li.menu-item:not(:last-child)' => 'border-bottom-width: {{SIZE}}{{UNIT}}',
 					],
@@ -1944,22 +1944,22 @@ protected function render() {
 			?>
 			<div class="hfe-nav-menu__toggle elementor-clickable hfe-flyout-trigger" tabindex="0">
 					<div class="hfe-nav-menu-icon">
-						<?php echo isset( $menu_close_icons[0] ) ? $menu_close_icons[0] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> 
+						<?php echo isset( $menu_close_icons[0] ) ? $menu_close_icons[0] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 					</div>
 				</div>
 			<div <?php echo wp_kses_post( $this->get_render_attribute_string( 'hfe-flyout' ) ); ?> >
 				<div class="hfe-flyout-overlay elementor-clickable"></div>
 				<div class="hfe-flyout-container">
 					<div id="hfe-flyout-content-id-<?php echo esc_attr( $this->get_id() ); ?>" class="hfe-side hfe-flyout-<?php echo esc_attr( $settings['flyout_layout'] ); ?> hfe-flyout-open" data-layout="<?php echo wp_kses_post( $settings['flyout_layout'] ); ?>" data-flyout-type="<?php echo wp_kses_post( $settings['flyout_type'] ); ?>">
-						<div class="hfe-flyout-content push">						
+						<div class="hfe-flyout-content push">
 							<nav <?php echo wp_kses_post( $this->get_render_attribute_string( 'hfe-nav-menu' ) ); ?>><?php echo $menu_html; ?></nav>
 							<div class="elementor-clickable hfe-flyout-close" tabindex="0">
 								<?php echo isset( $menu_close_icons[1] ) ? $menu_close_icons[1] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 							</div>
 						</div>
 					</div>
 				</div>
-			</div>				
+			</div>
 			<?php
 		} else {
 			$this->add_render_attribute(
@@ -2017,12 +2017,13 @@ protected function render() {
 
 			?>
 			<div <?php echo $this->get_render_attribute_string( 'hfe-main-menu' ); ?>>
-				<div class="hfe-nav-menu__toggle elementor-clickable">
+				<div role="button" class="hfe-nav-menu__toggle elementor-clickable">
+					<span class="screen-reader-text"><?php esc_html_e( 'Menu', 'header-footer-elementor' ); ?></span>
 					<div class="hfe-nav-menu-icon">
 						<?php echo isset( $menu_close_icons[0] ) ? $menu_close_icons[0] : ''; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 					</div>
 				</div>
-				<nav <?php echo $this->get_render_attribute_string( 'hfe-nav-menu' ); ?>><?php echo $menu_html; ?></nav>              
+				<nav <?php echo $this->get_render_attribute_string( 'hfe-nav-menu' ); ?>><?php echo $menu_html; ?></nav>
 			</div>
 			<?php
 		}

diff --git a/languages/header-footer-elementor.pot b/languages/header-footer-elementor.pot
@@ -1,15 +1,15 @@
-# Copyright (C) 2022 Brainstorm Force, Nikhil Chavan
+# Copyright (C) 2023 Brainstorm Force, Nikhil Chavan
 # This file is distributed under the same license as the Elementor Header & Footer Builder package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Elementor Header & Footer Builder 1.6.13\n"
+"Project-Id-Version: Elementor Header & Footer Builder 1.6.14\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/header-footer-elementor\n"
-"POT-Creation-Date: 2022-08-23 10:17:28+00:00\n"
+"POT-Creation-Date: 2023-05-11 04:40:05+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2022-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2023-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: en\n"
@@ -1105,6 +1105,7 @@ msgstr ""
 
 #: inc/widgets-manager/widgets/class-navigation-menu.php:187
 #: inc/widgets-manager/widgets/class-navigation-menu.php:197
+#: inc/widgets-manager/widgets/class-navigation-menu.php:2021
 msgid "Menu"
 msgstr ""