From 4a184556450b28af5c39fd140505f2a0ca4576c7 Mon Sep 17 00:00:00 2001 From: Ashar Fuadi Date: Mon, 29 Jul 2024 14:07:47 +0700 Subject: [PATCH] Admin Bar: Fix the order of the top-right items on Atomic sites (#38533) * Admin Bar: Fix the order of the top-right items on Atomic sites * Update versions --- .../jetpack-mu-wpcom/changelog/fix-admin-bar-order | 4 ++++ projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +- .../src/features/help-center/class-help-center.php | 10 +++------- .../src/features/wpcom-admin-bar/wpcom-admin-bar.php | 4 ++++ 5 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/fix-admin-bar-order diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-bar-order b/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-bar-order new file mode 100644 index 0000000000000..b65e92111bc3b --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/fix-admin-bar-order @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Admin Bar: Fix the order of the top-right items on Atomic sites diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index 8047ef33d69ce..2af64bd93f63f 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.50.0", + "version": "5.50.1-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 098ffed47ae1d..4a6b5998b47b8 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.50.0'; + const PACKAGE_VERSION = '5.50.1-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; diff --git a/projects/packages/jetpack-mu-wpcom/src/features/help-center/class-help-center.php b/projects/packages/jetpack-mu-wpcom/src/features/help-center/class-help-center.php index f200a647b266f..decd5746a75ab 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/help-center/class-help-center.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/help-center/class-help-center.php @@ -83,12 +83,9 @@ public function enqueue_script( $variant, $dependencies, $version ) { $script_dependencies = $dependencies ?? array(); if ( $variant === 'wp-admin' || $variant === 'wp-admin-disconnected' ) { - // Crazy high number to prevent Jetpack removing it - // https://github.com/Automattic/jetpack/blob/30213ee594cd06ca27199f73b2658236fda24622/projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php#L196. add_action( - 'wp_before_admin_bar_render', - function () { - global $wp_admin_bar; + 'admin_bar_menu', + function ( $wp_admin_bar ) { $wp_admin_bar->add_menu( array( 'id' => 'help-center', @@ -102,8 +99,7 @@ function () { ), ) ); - }, - 100000 + } ); } 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 index e5289eca448bf..48dfd5c7313d5 100644 --- 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 @@ -60,6 +60,10 @@ function wpcom_enqueue_admin_bar_assets() { #wpadminbar .quicklinks #wp-admin-bar-top-secondary #wp-admin-bar-search { order: -1; } + + #wpadminbar .quicklinks #wp-admin-bar-top-secondary #wp-admin-bar-help-center { + order: 1; + } CSS ); }