← All changes | modules/notes.php +22 -48 12.8.3 → 11.2 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,11 +122,28 @@
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	149	if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) {
		@@ -165,12 +172,8 @@
165	172	if ( ! is_object( $wp_admin_bar ) ) {
166	173	return;
167	174	}
168	175
169		- if ( self::is_block_editor() ) {
170		- return;
171		- }
172		-
173	176	$wpcom_locale = get_locale();
174	177
175	178	if ( ! class_exists( 'GP_Locales' ) ) {
176	179	if ( defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) && file_exists( JETPACK__GLOTPRESS_LOCALES_PATH ) ) {
		@@ -184,10 +187,8 @@
184	187	$wpcom_locale = $wpcom_locale_object->slug;
185	188	}
186	189	}
187	190
188		- $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>';
189		-
190	191	$classes = 'wpnt-loading wpn-read';
191	192	$wp_admin_bar->add_menu(
192	193	array(
193	194	'id' => 'notes',
		@@ -194,9 +195,9 @@
194	195	'title' => '<span id="wpnt-notes-unread-count" class="' . esc_attr( $classes ) . '">
195	196	<span class="noticon noticon-notification"></span>
196	197	</span>',
197	198	'meta' => array(
198		- '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>',
199	200	'class' => 'menupop',
200	201	),
201	202	'parent' => 'top-secondary',
202	203	)
		@@ -218,38 +219,11 @@
218	219	<?php if ( $link_accounts_url ) : ?>
219	220	var wpNotesLinkAccountsURL = '<?php echo esc_url( $link_accounts_url ); ?>';
220	221	<?php endif; ?>
221	222	/* ]]> */
222		- window.addEventListener('message', function ( event ) {
223		- // Confirm that the message is from the right origin.
224		- if ('https://widgets.wp.com' !== event.origin) {
225		- return;
226		- }
227		- // Check whether 3rd Party Cookies are blocked
228		- var has3PCBlocked = 'WPCOM:3PC:blocked' === event.data;
229		-
230		- var tagerElement = document.getElementById('wp-admin-bar-notes');
231		-
232		- if ( has3PCBlocked && tagerElement ) {
233		- // Hide the notification button/icon
234		- tagerElement.style.display = 'none';
235		- }
236		- }, false );
237	223	</script>
238	224	<?php
239	225	}
240	226
241		- /**
242		- * Checks to see if we're in the block editor.
243		- */
244		- public static function is_block_editor() {
245		- if ( function_exists( 'get_current_screen' ) ) {
246		- $current_screen = get_current_screen();
247		- if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
248		- return true;
249		- }
250		- }
251		- return false;
252		- }
253	227	}
254	228
255	229	Jetpack_Notifications::init();