Introduce amp_render_scripts() to print AMP component scripts and nothing else #1227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kienstra
approved these changes
Jun 26, 2018
There was a problem hiding this comment.
Approved
Hi @westonruter,
This looks good, and it should help to prevent the invalid script printing in wp_print_scripts, like in the support topics you mentioned.
| @@ -1049,7 +1050,7 @@ public function test_prepare_response() { | |||
| $this->assertContains( '<meta charset="' . get_bloginfo( 'charset' ) . '">', $sanitized_html ); | |||
| $this->assertContains( '<meta name="viewport" content="width=device-width,minimum-scale=1">', $sanitized_html ); | |||
| $this->assertContains( '<style amp-boilerplate>', $sanitized_html ); | |||
| $this->assertContains( '<style amp-custom>body { background: black; }', $sanitized_html ); | |||
| $this->assertRegExp( '#<style amp-custom>.*?body\s*{\s*background:\s*black;?\s*}.*?</style>#s', $sanitized_html ); | |||
There was a problem hiding this comment.
Nice use of $this->assertRegExp().
| * @param array $scripts Script handles mapped to URLs or true. | ||
| * @return string HTML for scripts tags that have not yet been done. | ||
| */ | ||
| function amp_render_scripts( $scripts ) { |
There was a problem hiding this comment.
It's nice how this is decomposed into amp_render_scripts(), to allow using it for Legacy Templating and theme support.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the same script printing logic which runs with theme support to also run for the legacy templates. This prevents scripts from being printed at
wp_print_scriptsaction.Fixes #1225.
Previously #1097, #1101.