Merge pull request #902 from Danny-Guzman/dev

Fixed issue with menus not working when on v5
CAWebPublishing · Jul 17, 2024 · 328728e · 328728e
2 parents 2e0e44f + feb47b8
commit 328728e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/build/caweb-admin.js b/build/caweb-admin.js
@@ -7868,10 +7868,10 @@ jQuery( document ).ready( function($) {
 			$('#ca_default_navigation_menu option[value="flexmega"]').addClass('d-none');
 			$('#ca_default_navigation_menu option[value="megadropdown"]').addClass('d-none');
 
-			// if current menu is no longer supported, set to singlelevel.
+			// if current menu is no longer supported, set to dropdown.
 			if( ['flexmega','megadropdown'].includes( current_menu ) ){
-				$(`#ca_default_navigation_menu option[value="${current_menu}"]`).attr('selected', false);
-				$('#ca_default_navigation_menu option[value="singlelevel"]').attr('selected', true);
+				$(`#ca_default_navigation_menu option[value="dropdown"]`).attr('selected', true);
+				$('#ca_default_navigation_menu option[value="singlelevel"]').attr('selected', false);
 			}
 
 			// Drop support for Menu Home Link.

diff --git a/build/caweb-customizer-controls.js b/build/caweb-customizer-controls.js
@@ -70,10 +70,10 @@ jQuery( document ).ready( function($) {
 			$('#ca_default_navigation_menu option[value="flexmega"]').addClass('d-none');
 			$('#ca_default_navigation_menu option[value="megadropdown"]').addClass('d-none');
 
-			// if current menu is no longer supported, set to singlelevel.
+			// if current menu is no longer supported, set to dropdown.
 			if( ['flexmega','megadropdown'].includes( current_menu ) ){
-				$(`#ca_default_navigation_menu option[value="${current_menu}"]`).attr('selected', false);
-				$('#ca_default_navigation_menu option[value="singlelevel"]').attr('selected', true);
+				$(`#ca_default_navigation_menu option[value="dropdown"]`).attr('selected', true);
+				$('#ca_default_navigation_menu option[value="singlelevel"]').attr('selected', false);
 			}
 
 			// Drop support for Menu Home Link.

diff --git a/inc/functions.php b/inc/functions.php
@@ -191,6 +191,8 @@ function caweb_template_colors() {
 function caweb_nav_menu_types() {
 	$menu_types = array(
 		'dropdown'     => 'Drop Down',
+		'flexmega'     => 'Flex Mega Menu',
+		'megadropdown' => 'Mega Drop',
 		'singlelevel'  => 'Single Level',
 	);
 

diff --git a/inc/options.php b/inc/options.php
@@ -21,7 +21,7 @@
 // Theme Option filters.
 add_filter( 'option_ca_site_color_scheme', 'caweb_ca_site_color_scheme', 10, 2 );
 add_filter( 'option_ca_fav_ico', 'caweb_pre_option_ca_fav_ico', 10, 2 );
-add_filter( 'option_ca_default_navigation_menu', 'caweb_pre_ca_default_navigation_menu', 10, 2 );
+//add_filter( 'option_ca_default_navigation_menu', 'caweb_pre_ca_default_navigation_menu', 10, 2 );
 
 /**
  * This filter is used to switch menu order.

diff --git a/src/scripts/admin/toggle-options.js b/src/scripts/admin/toggle-options.js
@@ -25,10 +25,10 @@ jQuery( document ).ready( function($) {
 			$('#ca_default_navigation_menu option[value="flexmega"]').addClass('d-none');
 			$('#ca_default_navigation_menu option[value="megadropdown"]').addClass('d-none');
 
-			// if current menu is no longer supported, set to singlelevel.
+			// if current menu is no longer supported, set to dropdown.
 			if( ['flexmega','megadropdown'].includes( current_menu ) ){
-				$(`#ca_default_navigation_menu option[value="${current_menu}"]`).attr('selected', false);
-				$('#ca_default_navigation_menu option[value="singlelevel"]').attr('selected', true);
+				$(`#ca_default_navigation_menu option[value="dropdown"]`).attr('selected', true);
+				$('#ca_default_navigation_menu option[value="singlelevel"]').attr('selected', false);
 			}
 
 			// Drop support for Menu Home Link.