Merge pull request #12 from soderlind/fix/csp

soderlind · web-flow · commit 2d76eee6b448 · 2025-08-11T11:20:19.000+02:00
Inline the custom JavaScript using wp_print_inline_script_tag()
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.6] - 2025-08-11
+
+### Fixed
+- Inline the custom javascript using `	()`
+- Ensure the script is printed in the footer
+
 ## [1.1.5] - 2025-07-16
 
 ### Fixed
diff --git a/additional-javascript.php b/additional-javascript.php
@@ -12,7 +12,7 @@
  * Plugin URI:  https://github.com/soderlind/additional-javascript
  * GitHub Plugin URI: https://github.com/soderlind/additional-javascript
  * Description: Add additional JavaScript using the WordPress Customizer.
- * Version:     1.1.5
+ * Version:     1.1.6
  * Author:      Per Soderlind
  * Author URI:  https://soderlind.no
  * Text Domain: additional-javascript
@@ -44,7 +44,7 @@
 );
 
 add_action( 'init', __NAMESPACE__ . '\register_post_type_javascript', 0 );
-add_action( 'wp_head', __NAMESPACE__ . '\soderlind_custom_javascript_cb', 110 );
+add_action( 'wp_footer', __NAMESPACE__ . '\soderlind_custom_javascript_cb', 110 );
 add_action( 'customize_register', __NAMESPACE__ . '\register_additional_javascript' );
 add_action( 'customize_preview_init', __NAMESPACE__ . '\customize_preview_additional_javascript' );
 add_action( 'customize_controls_enqueue_scripts', __NAMESPACE__ . '\on_customize_controls_enqueue_scripts' );
@@ -120,11 +120,7 @@ function register_post_type_javascript() {
 function soderlind_custom_javascript_cb() {
 	$javascript = soderlind_get_custom_javascript();
 	if ( $javascript || is_customize_preview() ) {
-		?>
-		<script id="soderlind-custom-javascript">
-			<?php echo $javascript; ?>
-		</script>
-		<?php
+		wp_print_inline_script_tag( $javascript, [ 'id' => 'soderlind-custom-javascript' ] );
 	}
 }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "additional-javascript",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"description": "Add additional JavaScript using the WordPress Customizer.",
 	"keywords": [
 		"wordpress",
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: javascript, customizer, code, custom code, js
 Donate link: https://paypal.me/PerSoderlind
 Requires at least: 6.5
 Tested up to: 6.8
-Stable tag: 1.1.5
+Stable tag: 1.1.6
 Requires PHP: 8.2
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
@@ -62,6 +62,10 @@ The JavaScript is added at the end of the `<head>` section of your site with a p
 
 == Changelog ==
 
+= 1.1.6 =
+* Inline the custom javascript using `wp_print_inline_script_tag()`
+* Ensure the script is printed in the footer
+
 = 1.1.5 =
 * Fixed deprecated PHP string interpolation syntax for PHP 8.2+ compatibility
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "additional-javascript",`
`3`		`- "version": "1.1.5",`
	`3`	`+ "version": "1.1.6",`
`4`	`4`	`"description": "Add additional JavaScript using the WordPress Customizer.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"wordpress",`