Masterbar: Restore Woo Express JITM (#34167)

* Masterbar: Restore Woo Express JITM * changelog
Automattic · Nov 19, 2023 · b22a850 · b22a850
1 parent 0259c84
commit b22a850
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/projects/plugins/jetpack/changelog/fix-woo-free-trial-jitm b/projects/plugins/jetpack/changelog/fix-woo-free-trial-jitm
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Restores Woo Express free trial upgrade JITM
diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/admin-menu.js b/projects/plugins/jetpack/modules/masterbar/admin-menu/admin-menu.js
@@ -11,44 +11,42 @@
 			return;
 		}
 
-		var adminbarBlogMenuList = adminbar.querySelector( '#wp-admin-bar-blog > .ab-sub-wrapper ul' );
-		if ( ! adminbarBlogMenuList ) {
-			return;
-		}
-
 		function setAriaExpanded( value ) {
 			var anchors = adminbar.querySelectorAll( '#wp-admin-bar-blog a' );
 			for ( var i = 0; i < anchors.length; i++ ) {
 				anchors[ i ].setAttribute( 'aria-expanded', value );
 			}
 		}
 
-		setFocusOnActiveMenuItem();
-		setAriaExpanded( 'false' );
-
-		var adminbarBlog = adminbar.querySelector( '#wp-admin-bar-blog' );
-		// Toggle sidebar when toggle is clicked.
-		if ( adminbarBlog ) {
-			adminbarBlog.addEventListener( 'click', function ( event ) {
-				event.preventDefault();
+		var adminbarBlogMenuList = adminbar.querySelector( '#wp-admin-bar-blog > .ab-sub-wrapper ul' );
+		if ( adminbarBlogMenuList ) {
+			setFocusOnActiveMenuItem();
+			setAriaExpanded( 'false' );
+
+			var adminbarBlog = adminbar.querySelector( '#wp-admin-bar-blog' );
+			// Toggle sidebar when toggle is clicked.
+			if ( adminbarBlog ) {
+				adminbarBlog.addEventListener( 'click', function ( event ) {
+					event.preventDefault();
 
-				// Close any open toolbar submenus.
-				var hovers = adminbar.querySelectorAll( '.hover' );
-				for ( var i = 0; i < hovers.length; i++ ) {
-					hovers[ i ].classList.remove( 'hover' );
-				}
+					// Close any open toolbar submenus.
+					var hovers = adminbar.querySelectorAll( '.hover' );
+					for ( var i = 0; i < hovers.length; i++ ) {
+						hovers[ i ].classList.remove( 'hover' );
+					}
 
-				wpwrap.classList.toggle( 'wp-responsive-open' );
-				if ( wpwrap.classList.contains( 'wp-responsive-open' ) ) {
-					setAriaExpanded( 'true' );
-					var first = document.querySelector( '#adminmenu a' );
-					if ( first ) {
-						first.focus();
+					wpwrap.classList.toggle( 'wp-responsive-open' );
+					if ( wpwrap.classList.contains( 'wp-responsive-open' ) ) {
+						setAriaExpanded( 'true' );
+						var first = document.querySelector( '#adminmenu a' );
+						if ( first ) {
+							first.focus();
+						}
+					} else {
+						setAriaExpanded( 'false' );
 					}
-				} else {
-					setAriaExpanded( 'false' );
-				}
-			} );
+				} );
+			}
 		}
 
 		if ( adminMenu ) {