← All changes | modules/notes.php +26 -50 13.7.2 → 11.0 View file →

		@@ -16,9 +16,9 @@
16	16
17	17	use Automattic\Jetpack\Connection\Manager as Connection_Manager;
18	18
19	19	if ( ! defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) {
20		- define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) . '-lite' );
	20	+ define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) );
21	21	}
22	22
23	23	/**
24	24	* Notifications class.
		@@ -81,17 +81,10 @@
81	81	}
82	82
83	83	// Do not show notifications in the Site Editor, which is always in fullscreen mode.
84	84	global $pagenow;
85		-
86		- // Pre 13.7 pages that still need to be supported if < 13.7 is
87		- // still installed.
88		- $allowed_old_pages = array( 'admin.php', 'themes.php' );
89		- $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
90		- // For Gutenberg > 13.7, the core `site-editor.php` route is used instead
91		- $is_site_editor_page = 'site-editor.php' === $pagenow;
92		-
93		- 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'] ) {
94	87	return;
95	88	}
96	89
97	90	add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 120 );
		@@ -104,11 +97,8 @@
104	97	*
105	98	* @return void
106	99	*/
107	100	public function styles_and_scripts() {
108		- if ( self::is_block_editor() ) {
109		- return;
110		- }
111	101	$is_rtl = is_rtl();
112	102
113	103	if ( Jetpack::is_module_active( 'masterbar' ) ) {
114	104	/**
		@@ -132,17 +122,31 @@
132	122	wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array( 'wpcom-notes-admin-bar' ), JETPACK_NOTES__CACHE_BUSTER );
133	123
134	124	$this->print_js();
135	125
	126	+ // attempt to use core or plugin libraries if registered.
136	127	$script_handles = array();
137		- 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 );
138	142	$script_handles[] = 'wpcom-notes-common';
	143	+ $script_handles[] = 'jquery';
	144	+ $script_handles[] = 'jquery-migrate';
	145	+ $script_handles[] = 'jquery-core';
139	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 );
140	147	$script_handles[] = 'wpcom-notes-admin-bar';
141	148
142		- $wp_notes_args = 'var wpNotesArgs = ' . wp_json_encode( array( 'cacheBuster' => JETPACK_NOTES__CACHE_BUSTER ) ) . ';';
143		- wp_add_inline_script( 'wpcom-notes-admin-bar', $wp_notes_args, 'before' );
144		-
145	149	if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) {
146	150	add_filter(
147	151	'script_loader_tag',
148	152	function ( $tag, $handle ) use ( $script_handles ) {
		@@ -168,12 +172,8 @@
168	172	if ( ! is_object( $wp_admin_bar ) ) {
169	173	return;
170	174	}
171	175
172		- if ( self::is_block_editor() ) {
173		- return;
174		- }
175		-
176	176	$wpcom_locale = get_locale();
177	177
178	178	if ( ! class_exists( 'GP_Locales' ) ) {
179	179	if ( defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) && file_exists( JETPACK__GLOTPRESS_LOCALES_PATH ) ) {
		@@ -187,37 +187,25 @@
187	187	$wpcom_locale = $wpcom_locale_object->slug;
188	188	}
189	189	}
190	190
191		- $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>';
192		-
193		- $title = self::get_notes_markup();
	191	+ $classes = 'wpnt-loading wpn-read';
194	192	$wp_admin_bar->add_menu(
195	193	array(
196	194	'id' => 'notes',
197		- 'title' => $title,
	195	+ 'title' => '<span id="wpnt-notes-unread-count" class="' . esc_attr( $classes ) . '">
	196	+ <span class="noticon noticon-notification"></span>
	197	+ </span>',
198	198	'meta' => array(
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>' . $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>',
200	200	'class' => 'menupop',
201	201	),
202	202	'parent' => 'top-secondary',
203		- 'href' => 'https://wordpress.com/notifications',
204	203	)
205	204	);
206	205	}
207	206
208	207	/**
209		- * Returns the HTML markup for used by notification in top bar
210		- *
211		- * @return string
212		- */
213		- private static function get_notes_markup() {
214		- return '<span id="wpnt-notes-unread-count" class="wpnt-loading wpn-read"></span>
215		-<span class="noticon noticon-bell ab-icon"></span>
216		-<span class="screen-reader-text">' . esc_html__( 'Notifications', 'jetpack' ) . '</span>';
217		- }
218		-
219		- /**
220	208	* Echos the Notes JS.
221	209	*
222	210	* @return void
223	211	*/
		@@ -235,19 +223,7 @@
235	223	</script>
236	224	<?php
237	225	}
238	226
239		- /**
240		- * Checks to see if we're in the block editor.
241		- */
242		- public static function is_block_editor() {
243		- if ( function_exists( 'get_current_screen' ) ) {
244		- $current_screen = get_current_screen();
245		- if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
246		- return true;
247		- }
248		- }
249		- return false;
250		- }
251	227	}
252	228
253	229	Jetpack_Notifications::init();