Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for AMP Dev Mode in Notes module #13450

Merged
merged 4 commits into from
Oct 5, 2019
Merged

Add support for AMP Dev Mode in Notes module #13450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de66747
Add AMP dev mode support for stats in admin bar
westonruter Sep 8, 2019
b8d660a
Add AMP dev mode support for Notes modules
westonruter Sep 8, 2019
5ebedfd
Use array() syntax instead of []
westonruter Sep 9, 2019
27f2494
Simplify marking styles for AMP Dev Mode
westonruter Sep 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions modules/notes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,51 @@ function styles_and_scripts() {
}

if ( ! $is_rtl ) {
wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.css' ), array(), JETPACK_NOTES__CACHE_BUSTER );
wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-v2.css' ), array( 'admin-bar' ), JETPACK_NOTES__CACHE_BUSTER );
} else {
wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/rtl/admin-bar-v2-rtl.css' ), array(), JETPACK_NOTES__CACHE_BUSTER );
wp_enqueue_style( 'wpcom-notes-admin-bar', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/rtl/admin-bar-v2-rtl.css' ), array( 'admin-bar' ), JETPACK_NOTES__CACHE_BUSTER );
}
wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array(), JETPACK_NOTES__CACHE_BUSTER );

wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array( 'wpcom-notes-admin-bar' ), JETPACK_NOTES__CACHE_BUSTER );

$this->print_js();

// attempt to use core or plugin libraries if registered
$script_handles = array();
if ( !wp_script_is( 'mustache', 'registered' ) ) {
wp_register_script( 'mustache', $this->wpcom_static_url( '/wp-content/js/mustache.js' ), null, JETPACK_NOTES__CACHE_BUSTER );
}
$script_handles[] = 'mustache';
if ( !wp_script_is( 'underscore', 'registered' ) ) {
wp_register_script( 'underscore', $this->wpcom_static_url( '/wp-includes/js/underscore.min.js' ), null, JETPACK_NOTES__CACHE_BUSTER );
}
$script_handles[] = 'underscore';
if ( !wp_script_is( 'backbone', 'registered' ) ) {
wp_register_script( 'backbone', $this->wpcom_static_url( '/wp-includes/js/backbone.min.js' ), array( 'underscore' ), JETPACK_NOTES__CACHE_BUSTER );
}
$script_handles[] = 'backbone';

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 );
$script_handles[] = 'wpcom-notes-common';
$script_handles[] = 'jquery';
$script_handles[] = 'jquery-migrate';
$script_handles[] = 'jquery-core';
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 );
$script_handles[] = 'wpcom-notes-admin-bar';

if ( class_exists( 'Jetpack_AMP_Support' ) && Jetpack_AMP_Support::is_amp_request() ) {
add_filter(
'script_loader_tag',
function ( $tag, $handle ) use ( $script_handles ) {
if ( in_array( $handle, $script_handles, true ) ) {
$tag = preg_replace( '/(?<=<script)(?=\s|>)/i', ' data-ampdevmode', $tag );
}
return $tag;
},
10,
2
);
}
}

function admin_bar_menu() {
Expand Down Expand Up @@ -180,7 +204,7 @@ function admin_bar_menu() {
function print_js() {
$link_accounts_url = is_user_logged_in() && !Jetpack::is_user_connected() ? Jetpack::admin_url() : false;
?>
<script type="text/javascript">
<script data-ampdevmode type="text/javascript">
/* <![CDATA[ */
var wpNotesIsJetpackClient = true;
var wpNotesIsJetpackClientV2 = true;
Expand Down
12 changes: 4 additions & 8 deletions modules/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ function stats_admin_bar_head() {
add_action( 'admin_bar_menu', 'stats_admin_bar_menu', 100 );
?>

<style type='text/css'>
<style data-ampdevmode type='text/css'>
#wpadminbar .quicklinks li#wp-admin-bar-stats {
height: 32px;
}
Expand Down Expand Up @@ -878,14 +878,10 @@ function stats_admin_bar_menu( &$wp_admin_bar ) {
$title = esc_attr( __( 'Views over 48 hours. Click for more Site Stats.', 'jetpack' ) );

$menu = array(
'id' => 'stats',
'href' => $url,
'id' => 'stats',
'href' => $url,
'title' => "<div><img src='$img_src' srcset='$img_src 1x, $img_src_2x 2x' width='112' height='24' alt='$alt' title='$title'></div>",
);
if ( Jetpack_AMP_Support::is_amp_request() ) {
$menu['title'] = "<amp-img src='$img_src_2x' width=112 height=24 layout=fixed alt='$alt' title='$title'></amp-img>";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Originally in https://github.com/Automattic/jetpack/pull/10945/files#diff-f3b7c7c56cbf7524138248379aa9b949R991

Now unnecessary.

} else {
$menu['title'] = "<div><img src='$img_src' srcset='$img_src 1x, $img_src_2x 2x' width='112' height='24' alt='$alt' title='$title'></div>";
}

$wp_admin_bar->add_menu( $menu );
}
Expand Down