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

Introduce stylesheet prioritization when determining which to concatenate #2346

Merged
merged 14 commits into from
May 23, 2019
Merged

Introduce stylesheet prioritization when determining which to concatenate #2346

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ef52c80
Introduce stylesheet priorities to ensure important styles aren't exc…
westonruter May 15, 2019
5a52afb
Eliminate IE hacks for admin-bar bump CSS
westonruter May 18, 2019
7c26db0
Remove admin bar element and associated styles if excessive CSS
westonruter May 18, 2019
449b9dc
Remove obsolete AMP_Style_Sanitizer::$stylesheets var
westonruter May 18, 2019
121c677
Eliminate the option to disable the admin bar
westonruter May 18, 2019
cfeada6
Exclude both admin-bar stylesheets if either one is excluded
westonruter May 18, 2019
d8ead1c
Add test for stylesheet prioritization
westonruter May 19, 2019
ae3c140
Prevent element ID and class from being duplicated in CSS manifest
westonruter May 19, 2019
ee9fbb5
Extract admin bar selector from translated string; remove todo
westonruter May 21, 2019
fd23dc0
Improve error messages for CSS @import failures
westonruter May 23, 2019
ab40437
Fix bug with replacing @import with contents
westonruter May 23, 2019
f7f02ac
Fix bug with non-rejected @import statements being dropped
westonruter May 23, 2019
9946158
Add tests for fixes to @import handling
westonruter May 23, 2019
a473956
Remove unused closure import
westonruter May 23, 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
27 changes: 17 additions & 10 deletions includes/class-amp-theme-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,23 +931,14 @@ function() {
PHP_INT_MAX
);

add_action( 'admin_bar_init', array( __CLASS__, 'init_admin_bar' ) );
add_action( 'wp_head', 'amp_add_generator_metadata', 20 );
add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_assets' ), 0 ); // Enqueue before theme's styles.
add_action( 'wp_enqueue_scripts', array( __CLASS__, 'dequeue_customize_preview_scripts' ), 1000 );
add_filter( 'customize_partial_render', array( __CLASS__, 'filter_customize_partial_render' ) );

add_action( 'wp_footer', 'amp_print_analytics' );

/*
* Disable admin bar because admin-bar.css (28K) and Dashicons (48K) alone
* combine to surpass the 50K limit imposed for the amp-custom style.
*/
if ( AMP_Options_Manager::get_option( 'disable_admin_bar' ) ) {
add_filter( 'show_admin_bar', '__return_false', 100 );
} else {
add_action( 'admin_bar_init', array( __CLASS__, 'init_admin_bar' ) );
}

/*
* Start output buffering at very low priority for sake of plugins and themes that use template_redirect
* instead of template_include.
Expand Down Expand Up @@ -1299,6 +1290,22 @@ function() {
41
);

// Convert admin bar bump callback into an inline style for admin-bar. See \WP_Admin_Bar::initialize().
if ( current_theme_supports( 'admin-bar' ) ) {
$admin_bar_args = get_theme_support( 'admin-bar' );
$header_callback = $admin_bar_args[0]['callback'];
} else {
$header_callback = '_admin_bar_bump_cb';
}
remove_action( 'wp_head', $header_callback );
if ( '__return_false' !== $header_callback ) {
ob_start();
call_user_func( $header_callback );
$style = ob_get_clean();
$data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $style ) ); // See wp_add_inline_style().
wp_add_inline_style( 'admin-bar', $data );
}

// Emulate customize support script in PHP, to assume Customizer.
add_filter(
'body_class',
Expand Down
2 changes: 0 additions & 2 deletions includes/options/class-amp-options-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class AMP_Options_Manager {
'analytics' => array(),
'auto_accept_sanitization' => true,
'accept_tree_shaking' => true,
'disable_admin_bar' => false,
'all_templates_supported' => true,
'supported_templates' => array( 'is_singular' ),
'enable_response_caching' => true,
Expand Down Expand Up @@ -137,7 +136,6 @@ public static function validate_options( $new_options ) {

$options['auto_accept_sanitization'] = ! empty( $new_options['auto_accept_sanitization'] );
$options['accept_tree_shaking'] = ! empty( $new_options['accept_tree_shaking'] );
$options['disable_admin_bar'] = ! empty( $new_options['disable_admin_bar'] );
$options['enable_amp_stories'] = ! empty( $new_options['enable_amp_stories'] );

// Validate post type support.
Expand Down
10 changes: 0 additions & 10 deletions includes/options/class-amp-options-menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,16 +365,6 @@ public function render_validation_handling() {
updateHiddenClasses();
})( jQuery );
</script>

<p>
<label for="disable_admin_bar">
<input id="disable_admin_bar" type="checkbox" name="<?php echo esc_attr( AMP_Options_Manager::OPTION_NAME . '[disable_admin_bar]' ); ?>" <?php checked( AMP_Options_Manager::get_option( 'disable_admin_bar' ) ); ?>>
<?php esc_html_e( 'Disable admin bar on AMP pages.', 'amp' ); ?>
</label>
</p>
<p class="description">
<?php esc_html_e( 'An additional stylesheet is required to properly render the admin bar. If the additional stylesheet causes the total CSS to surpass 50KB then the admin bar should be disabled to prevent a validation error or an unstyled admin bar in AMP responses.', 'amp' ); ?>
</p>
</fieldset>
<?php
}
Expand Down
Loading