← All changes | modules/notes.php +31 -60 14.4.2 → 11.1 View file →

		@@ -14,12 +14,11 @@
14	14	* @package automattic/jetpack
15	15	*/
16	16
17	17	use Automattic\Jetpack\Connection\Manager as Connection_Manager;
18		-use Automattic\Jetpack\Status\Host;
19	18
20	19	if ( ! defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) {
21		- define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) . '-lite' );
	20	+ define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) );
22	21	}
23	22
24	23	/**
25	24	* Notifications class.
		@@ -82,17 +81,10 @@
82	81	}
83	82
84	83	// Do not show notifications in the Site Editor, which is always in fullscreen mode.
85	84	global $pagenow;
86		-
87		- // Pre 13.7 pages that still need to be supported if < 13.7 is
88		- // still installed.
89		- $allowed_old_pages = array( 'admin.php', 'themes.php' );
90		- $is_old_site_editor_page = in_array( $pagenow, $allowed_old_pages, true ) && isset( $_GET['page'] ) && 'gutenberg-edit-site' === $_GET['page']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
91		- // For Gutenberg > 13.7, the core `site-editor.php` route is used instead
92		- $is_site_editor_page = 'site-editor.php' === $pagenow;
93		-
94		- if ( $is_site_editor_page || $is_old_site_editor_page ) {
	85	+ // phpcs:ignore WordPress.Security.NonceVerification
	86	+ if ( 'admin.php' === $pagenow && isset( $_GET['page'] ) && 'gutenberg-edit-site' === $_GET['page'] ) {
95	87	return;
96	88	}
97	89
98	90	add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 120 );
		@@ -105,14 +97,11 @@
105	97	*
106	98	* @return void
107	99	*/
108	100	public function styles_and_scripts() {
109		- if ( self::is_block_editor() ) {
110		- return;
111		- }
112	101	$is_rtl = is_rtl();
113	102
114		- if ( ( new Host() )->is_woa_site() ) {
	103	+ if ( Jetpack::is_module_active( 'masterbar' ) ) {
115	104	/**
116	105	* Can be used to force Notifications to display in RTL style.
117	106	*
118	107	* @module notes
		@@ -133,17 +122,31 @@
133	122	wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array( 'wpcom-notes-admin-bar' ), JETPACK_NOTES__CACHE_BUSTER );
134	123
135	124	$this->print_js();
136	125
	126	+ // attempt to use core or plugin libraries if registered.
137	127	$script_handles = array();
138		- wp_register_script( 'wpcom-notes-common', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/notes-common-lite.min.js' ), array(), JETPACK_NOTES__CACHE_BUSTER, true );
	128	+ if ( ! wp_script_is( 'mustache', 'registered' ) ) {
	129	+ wp_register_script( 'mustache', $this->wpcom_static_url( '/wp-content/js/mustache.js' ), null, JETPACK_NOTES__CACHE_BUSTER, true );
	130	+ }
	131	+ $script_handles[] = 'mustache';
	132	+ if ( ! wp_script_is( 'underscore', 'registered' ) ) {
	133	+ wp_register_script( 'underscore', $this->wpcom_static_url( '/wp-includes/js/underscore.min.js' ), null, JETPACK_NOTES__CACHE_BUSTER, true );
	134	+ }
	135	+ $script_handles[] = 'underscore';
	136	+ if ( ! wp_script_is( 'backbone', 'registered' ) ) {
	137	+ wp_register_script( 'backbone', $this->wpcom_static_url( '/wp-includes/js/backbone.min.js' ), array( 'underscore' ), JETPACK_NOTES__CACHE_BUSTER, true );
	138	+ }
	139	+ $script_handles[] = 'backbone';
	140	+
	141	+ wp_register_script( 'wpcom-notes-common', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/notes-common-v2.js' ), array( 'jquery', 'underscore', 'backbone', 'mustache' ), JETPACK_NOTES__CACHE_BUSTER, true );
139	142	$script_handles[] = 'wpcom-notes-common';
	143	+ $script_handles[] = 'jquery';
	144	+ $script_handles[] = 'jquery-migrate';
	145	+ $script_handles[] = 'jquery-core';
140	146	wp_enqueue_script( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.js' ), array( 'wpcom-notes-common' ), JETPACK_NOTES__CACHE_BUSTER, true );
141	147	$script_handles[] = 'wpcom-notes-admin-bar';
142	148
143		- $wp_notes_args = 'var wpNotesArgs = ' . wp_json_encode( array( 'cacheBuster' => JETPACK_NOTES__CACHE_BUSTER ) ) . ';';
144		- wp_add_inline_script( 'wpcom-notes-admin-bar', $wp_notes_args, 'before' );
145		-
146	149	if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) {
147	150	add_filter(
148	151	'script_loader_tag',
149	152	function ( $tag, $handle ) use ( $script_handles ) {
		@@ -169,14 +172,10 @@
169	172	if ( ! is_object( $wp_admin_bar ) ) {
170	173	return;
171	174	}
172	175
173		- if ( self::is_block_editor() ) {
174		- return;
175		- }
	176	+ $wpcom_locale = get_locale();
176	177
177		- $user_locale = get_user_locale();
178		-
179	178	if ( ! class_exists( 'GP_Locales' ) ) {
180	179	if ( defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) && file_exists( JETPACK__GLOTPRESS_LOCALES_PATH ) ) {
181	180	require JETPACK__GLOTPRESS_LOCALES_PATH;
182	181	}
		@@ -182,47 +181,31 @@
182	181	}
183	182	}
184	183
185	184	if ( class_exists( 'GP_Locales' ) ) {
186		- $jetpack_locale_object = GP_Locales::by_field( 'slug', $user_locale );
187		- if ( $jetpack_locale_object instanceof GP_Locale ) {
188		- $user_locale = $jetpack_locale_object->slug;
	185	+ $wpcom_locale_object = GP_Locales::by_field( 'wp_locale', $wpcom_locale );
	186	+ if ( $wpcom_locale_object instanceof GP_Locale ) {
	187	+ $wpcom_locale = $wpcom_locale_object->slug;
189	188	}
190	189	}
191	190
192		- $third_party_cookie_check_iframe = '<span style="display:none;"><iframe class="jetpack-notes-cookie-check" src="https://widgets.wp.com/3rd-party-cookie-check/index.html"></iframe></span>';
193		-
194		- $title = self::get_notes_markup();
195		-
196		- // The default fallback is `en_US`. Remove underscore if present, noting that lang codes can be more than three chars.
197		- $user_locale = strtolower( explode( '_', $user_locale, 2 )[0] );
198		-
	191	+ $classes = 'wpnt-loading wpn-read';
199	192	$wp_admin_bar->add_menu(
200	193	array(
201	194	'id' => 'notes',
202		- 'title' => $title,
	195	+ 'title' => '<span id="wpnt-notes-unread-count" class="' . esc_attr( $classes ) . '">
	196	+ <span class="noticon noticon-notification"></span>
	197	+ </span>',
203	198	'meta' => array(
204		- 'html' => '<div id="wpnt-notes-panel2" class="intrinsic-ignore" style="display:none" lang="' . esc_attr( $user_locale ) . '" dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __( 'Notifications', 'jetpack' ) . '</span><span class="wpnt-notes-panel-link"></span></div></div>' . $third_party_cookie_check_iframe,
	199	+ 'html' => '<div id="wpnt-notes-panel2" class="intrinsic-ignore" style="display:none" lang="' . esc_attr( $wpcom_locale ) . '" dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __( 'Notifications', 'jetpack' ) . '</span><span class="wpnt-notes-panel-link"></span></div></div>',
205	200	'class' => 'menupop',
206	201	),
207	202	'parent' => 'top-secondary',
208		- 'href' => 'https://wordpress.com/notifications',
209	203	)
210	204	);
211	205	}
212	206
213	207	/**
214		- * Returns the HTML markup for used by notification in top bar
215		- *
216		- * @return string
217		- */
218		- private static function get_notes_markup() {
219		- return '<span id="wpnt-notes-unread-count" class="wpnt-loading wpn-read"></span>
220		-<span class="noticon noticon-bell ab-icon"></span>
221		-<span class="screen-reader-text">' . esc_html__( 'Notifications', 'jetpack' ) . '</span>';
222		- }
223		-
224		- /**
225	208	* Echos the Notes JS.
226	209	*
227	210	* @return void
228	211	*/
		@@ -240,19 +223,7 @@
240	223	</script>
241	224	<?php
242	225	}
243	226
244		- /**
245		- * Checks to see if we're in the block editor.
246		- */
247		- public static function is_block_editor() {
248		- if ( function_exists( 'get_current_screen' ) ) {
249		- $current_screen = get_current_screen();
250		- if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
251		- return true;
252		- }
253		- }
254		- return false;
255		- }
256	227	}
257	228
258	229	Jetpack_Notifications::init();