Admin Bar: Make it consistent between Calypso and WP Admin regardless…

… of the value of Admin Interface Style (#38362)
Automattic · Jul 17, 2024 · ebfa7d3 · ebfa7d3
1 parent b4e1648
commit ebfa7d3
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 16 deletions.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/feat-unify-masterbar b/projects/packages/jetpack-mu-wpcom/changelog/feat-unify-masterbar
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Admin Bar: Make it consistent between Calypso and WP Admin regardless of the value of Admin Interface Style
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php
@@ -9,9 +9,7 @@
 
 use Automattic\Jetpack\Jetpack_Mu_Wpcom;
 
-if ( get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
-	return;
-}
+define( 'WPCOM_ADMIN_BAR_UNIFICATION', true );
 
 /**
  * Enqueue assets needed by the WordPress.com admin bar.

diff --git a/projects/packages/masterbar/changelog/feat-unify-masterbar b/projects/packages/masterbar/changelog/feat-unify-masterbar
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Admin Bar: Make it consistent between Calypso and WP Admin regardless of the value of Admin Interface Style
diff --git a/projects/packages/masterbar/composer.json b/projects/packages/masterbar/composer.json
@@ -63,7 +63,7 @@
 	"extra": {
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "0.3.x-dev"
+			"dev-trunk": "0.4.x-dev"
 		},
 		"changelogger": {
 			"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"

diff --git a/projects/packages/masterbar/package.json b/projects/packages/masterbar/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-masterbar",
-	"version": "0.3.1",
+	"version": "0.4.0-alpha",
 	"description": "The WordPress.com Toolbar feature replaces the default admin bar and offers quick links to the Reader, all your sites, your WordPress.com profile, and notifications.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/masterbar/#readme",
 	"bugs": {

diff --git a/projects/packages/masterbar/src/admin-color-schemes/class-admin-color-schemes.php b/projects/packages/masterbar/src/admin-color-schemes/class-admin-color-schemes.php
@@ -32,7 +32,7 @@ public function __construct() {
 			add_action( 'rest_api_init', array( $this, 'register_admin_color_meta' ) );
 		}
 
-		if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) { // Classic sites.
+		if ( ( defined( 'WPCOM_ADMIN_BAR_UNIFICATION' ) && WPCOM_ADMIN_BAR_UNIFICATION ) || get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) { // Classic sites.
 			add_filter( 'css_do_concat', array( $this, 'disable_css_concat_for_color_schemes' ), 10, 2 );
 			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_color_scheme_for_sidebar_notice' ) );
 		} else { // Default and self-hosted sites.

diff --git a/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php
@@ -276,8 +276,8 @@ public function enqueue_scripts() {
 			)
 		);
 
-		// Load nav unification styles when the user isn't using wp-admin interface style.
-		if ( ! $this->use_wp_admin_interface() ) {
+		// Load nav unification styles for the admin bar when the user isn't using wp-admin interface style.
+		if ( ! $this->use_wp_admin_interface() && ! ( defined( 'WPCOM_ADMIN_BAR_UNIFICATION' ) && WPCOM_ADMIN_BAR_UNIFICATION ) ) {
 			Assets::register_script(
 				'jetpack-admin-nav-unification',
 				$assets_base_path . 'admin-menu-nav-unification.js',

diff --git a/projects/packages/masterbar/src/class-main.php b/projects/packages/masterbar/src/class-main.php
@@ -14,7 +14,7 @@
  */
 class Main {
 
-	const PACKAGE_VERSION = '0.3.1';
+	const PACKAGE_VERSION = '0.4.0-alpha';
 
 	/**
 	 * Initializer.
@@ -29,7 +29,7 @@ public static function init() {
 
 		new Admin_Color_Schemes();
 
-		if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) {
+		if ( ( defined( 'WPCOM_ADMIN_BAR_UNIFICATION' ) && WPCOM_ADMIN_BAR_UNIFICATION ) || get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) {
 			return;
 		}
 

diff --git a/projects/plugins/jetpack/changelog/feat-unify-masterbar b/projects/plugins/jetpack/changelog/feat-unify-masterbar
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/feat-unify-masterbar b/projects/plugins/mu-wpcom-plugin/changelog/feat-unify-masterbar
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
diff --git a/projects/plugins/wpcomsh/changelog/feat-unify-masterbar b/projects/plugins/wpcomsh/changelog/feat-unify-masterbar
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock