← All changes | modules/notes.php +48 -66 16.2-beta → 10.8 View file →

		@@ -1,8 +1,8 @@
1	1	<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
2	2	/**
3	3	* Module Name: Notifications
4		- * Module Description: Receive real‑time notifications about site activity across your devices.
	4	+ * Module Description: Receive instant notifications of site comments and likes.
5	5	* Sort Order: 13
6	6	* First Introduced: 1.9
7	7	* Requires Connection: Yes
8	8	* Requires User Connection: Yes
		@@ -14,16 +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		-if ( ! defined( 'ABSPATH' ) ) {
21		- exit( 0 );
22		-}
23		-
24	19	if ( ! defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) {
25		- define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) . '-lite' );
	20	+ define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) );
26	21	}
27	22
28	23	/**
29	24	* Notifications class.
		@@ -84,8 +79,15 @@
84	79	if ( ! has_filter( 'show_admin_bar', '__return_true' ) && ! is_user_logged_in() ) {
85	80	return;
86	81	}
87	82
	83	+ // Do not show notifications in the Site Editor, which is always in fullscreen mode.
	84	+ global $pagenow;
	85	+ // phpcs:ignore WordPress.Security.NonceVerification
	86	+ if ( 'admin.php' === $pagenow && isset( $_GET['page'] ) && 'gutenberg-edit-site' === $_GET['page'] ) {
	87	+ return;
	88	+ }
	89	+
88	90	add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 120 );
89	91	add_action( 'wp_head', array( $this, 'styles_and_scripts' ), 120 );
90	92	add_action( 'admin_head', array( $this, 'styles_and_scripts' ) );
91	93	}
		@@ -97,9 +99,9 @@
97	99	*/
98	100	public function styles_and_scripts() {
99	101	$is_rtl = is_rtl();
100	102
101		- if ( ( new Host() )->is_woa_site() ) {
	103	+ if ( Jetpack::is_module_active( 'masterbar' ) ) {
102	104	/**
103	105	* Can be used to force Notifications to display in RTL style.
104	106	*
105	107	* @module notes
		@@ -120,17 +122,31 @@
120	122	wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array( 'wpcom-notes-admin-bar' ), JETPACK_NOTES__CACHE_BUSTER );
121	123
122	124	$this->print_js();
123	125
	126	+ // attempt to use core or plugin libraries if registered.
124	127	$script_handles = array();
125		- 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 );
126	142	$script_handles[] = 'wpcom-notes-common';
	143	+ $script_handles[] = 'jquery';
	144	+ $script_handles[] = 'jquery-migrate';
	145	+ $script_handles[] = 'jquery-core';
127	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 );
128	147	$script_handles[] = 'wpcom-notes-admin-bar';
129	148
130		- $wp_notes_args = 'var wpNotesArgs = ' . wp_json_encode( array( 'cacheBuster' => JETPACK_NOTES__CACHE_BUSTER ), JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) . ';';
131		- wp_add_inline_script( 'wpcom-notes-admin-bar', $wp_notes_args, 'before' );
132		-
133	149	if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) {
134	150	add_filter(
135	151	'script_loader_tag',
136	152	function ( $tag, $handle ) use ( $script_handles ) {
		@@ -156,9 +172,9 @@
156	172	if ( ! is_object( $wp_admin_bar ) ) {
157	173	return;
158	174	}
159	175
160		- $user_locale = get_user_locale();
	176	+ $wpcom_locale = get_locale();
161	177
162	178	if ( ! class_exists( 'GP_Locales' ) ) {
163	179	if ( defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) && file_exists( JETPACK__GLOTPRESS_LOCALES_PATH ) ) {
164	180	require JETPACK__GLOTPRESS_LOCALES_PATH;
		@@ -165,51 +181,31 @@
165	181	}
166	182	}
167	183
168	184	if ( class_exists( 'GP_Locales' ) ) {
169		- $jetpack_locale_object = GP_Locales::by_field( 'slug', $user_locale );
170		- if ( $jetpack_locale_object instanceof GP_Locale ) {
171		- $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;
172	188	}
173	189	}
174	190
175		- $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>';
176		-
177		- // Opt into the v3 notifications panel/iframe via the `notifications=v3` query parameter.
178		- $notifications_version = sanitize_key( wp_unslash( $_GET['notifications'] ?? '' ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
179		- $panel_id = 'v3' === $notifications_version ? 'wpnt-notes-panel3' : 'wpnt-notes-panel2';
180		-
181		- $title = self::get_notes_markup();
182		-
183		- // The default fallback is `en_US`. Remove underscore if present, noting that lang codes can be more than three chars.
184		- $user_locale = strtolower( explode( '_', $user_locale, 2 )[0] );
185		-
	191	+ $classes = 'wpnt-loading wpn-read';
186	192	$wp_admin_bar->add_menu(
187	193	array(
188	194	'id' => 'notes',
189		- 'title' => $title,
	195	+ 'title' => '<span id="wpnt-notes-unread-count" class="' . esc_attr( $classes ) . '">
	196	+ <span class="noticon noticon-notification"></span>
	197	+ </span>',
190	198	'meta' => array(
191		- 'html' => '<div id="' . esc_attr( $panel_id ) . '" 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>',
192	200	'class' => 'menupop',
193	201	),
194	202	'parent' => 'top-secondary',
195		- 'href' => 'https://wordpress.com/reader/notifications',
196	203	)
197	204	);
198	205	}
199	206
200	207	/**
201		- * Returns the HTML markup for used by notification in top bar
202		- *
203		- * @return string
204		- */
205		- private static function get_notes_markup() {
206		- return '<span id="wpnt-notes-unread-count" class="wpnt-loading wpn-read"></span>
207		-<span class="noticon noticon-bell ab-icon"></span>
208		-<span class="screen-reader-text">' . esc_html__( 'Notifications', 'jetpack' ) . '</span>';
209		- }
210		-
211		- /**
212	208	* Echos the Notes JS.
213	209	*
214	210	* @return void
215	211	*/
		@@ -214,34 +210,20 @@
214	210	* @return void
215	211	*/
216	212	public function print_js() {
217	213	$link_accounts_url = is_user_logged_in() && ! ( new Connection_Manager( 'jetpack' ) )->is_user_connected() ? Jetpack::admin_url() : false;
218		- $script_contents = <<<'JS'
219		-var wpNotesIsJetpackClient = true;
220		-var wpNotesIsJetpackClientV2 = true;
221		-JS;
222		- if ( $link_accounts_url ) {
223		- $script_contents .= "\nvar wpNotesLinkAccountsURL = " . wp_json_encode( $link_accounts_url, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) . ';';
224		- }
225		- wp_print_inline_script_tag(
226		- $script_contents,
227		- array(
228		- 'data-ampdevmode' => true,
229		- )
230		- );
	214	+ ?>
	215	+<script data-ampdevmode type="text/javascript">
	216	+/* <![CDATA[ */
	217	+ var wpNotesIsJetpackClient = true;
	218	+ var wpNotesIsJetpackClientV2 = true;
	219	+ <?php if ( $link_accounts_url ) : ?>
	220	+ var wpNotesLinkAccountsURL = '<?php echo esc_url( $link_accounts_url ); ?>';
	221	+<?php endif; ?>
	222	+/* ]]> */
	223	+</script>
	224	+ <?php
231	225	}
232	226
233		- /**
234		- * Checks to see if we're in the block editor.
235		- */
236		- public static function is_block_editor() {
237		- if ( function_exists( 'get_current_screen' ) ) {
238		- $current_screen = get_current_screen();
239		- if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
240		- return true;
241		- }
242		- }
243		- return false;
244		- }
245	227	}
246	228
247	229	Jetpack_Notifications::init();