From af52f563398b42cff82d38eefa55c8121d698ebe Mon Sep 17 00:00:00 2001
From: Brian Henry <BrianHenryIE@gmail.com>
Date: Mon, 6 Mar 2023 16:46:08 -0800
Subject: [PATCH] admin_enqueue_scripts after common.js

---
 src/Dismiss.php | 60 ++++++++++++++++++++++++++-----------------------
 src/Notices.php | 20 -----------------
 2 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/src/Dismiss.php b/src/Dismiss.php
index 2abcbd9..22cfe98 100644
--- a/src/Dismiss.php
+++ b/src/Dismiss.php
@@ -63,42 +63,46 @@ public function __construct( $id, $prefix, $scope = 'global' ) {
 
 		// Handle AJAX requests to dismiss the notice.
 		add_action( 'wp_ajax_wptrt_dismiss_notice', [ $this, 'ajax_maybe_dismiss_notice' ] );
+
+		// Print the script after common.js.
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_script' ) );
 	}
 
 	/**
 	 * Print the script for dismissing the notice.
 	 *
-	 * @access private
 	 * @since 1.0
 	 * @return void
 	 */
-	public function print_script() {
-
-		// Create a nonce.
-		$nonce = wp_create_nonce( 'wptrt_dismiss_notice_' . $this->id );
-		?>
-		<script>
-		window.addEventListener( 'load', function() {
-			var dismissBtn  = document.querySelector( '#wptrt-notice-<?php echo esc_attr( $this->id ); ?> .notice-dismiss' );
-
-			// Add an event listener to the dismiss button.
-			dismissBtn.addEventListener( 'click', function( event ) {
-				var httpRequest = new XMLHttpRequest(),
-					postData    = '';
-
-				// Build the data to send in our request.
-				// Data has to be formatted as a string here.
-				postData += 'id=<?php echo esc_attr( rawurlencode( $this->id ) ); ?>';
-				postData += '&action=wptrt_dismiss_notice';
-				postData += '&nonce=<?php echo esc_html( $nonce ); ?>';
-
-				httpRequest.open( 'POST', '<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>' );
-				httpRequest.setRequestHeader( 'Content-Type', 'application/x-www-form-urlencoded' )
-				httpRequest.send( postData );
-			});
-		});
-		</script>
-		<?php
+	public function add_script() {
+
+		$id             = esc_attr( $this->id );
+		$nonce          = wp_create_nonce( 'wptrt_dismiss_notice_' . $this->id );
+		$admin_ajax_url = esc_url( admin_url( 'admin-ajax.php' ) );
+
+		$script = <<<EOD
+jQuery( function() {
+    var dismissBtn  = document.querySelector( '#wptrt-notice-$id .notice-dismiss' );
+
+    // Add an event listener to the dismiss button.
+    dismissBtn.addEventListener( 'click', function( event ) {
+    	var httpRequest = new XMLHttpRequest(),
+    		postData    = '';
+
+    	// Build the data to send in our request.
+    	// Data has to be formatted as a string here.
+    	postData += 'id=$id';
+    	postData += '&action=wptrt_dismiss_notice';
+    	postData += '&nonce=$nonce';
+
+    	httpRequest.open( 'POST', '$admin_ajax_url' );
+    	httpRequest.setRequestHeader( 'Content-Type', 'application/x-www-form-urlencoded' )
+    	httpRequest.send( postData );
+    });
+});
+EOD;
+
+		wp_add_inline_script( 'common', $script, 'after' );
 	}
 
 	/**
diff --git a/src/Notices.php b/src/Notices.php
index 27d661e..8d14367 100644
--- a/src/Notices.php
+++ b/src/Notices.php
@@ -42,9 +42,6 @@ public function boot() {
 
 		// Add the notice.
 		add_action( 'admin_notices', [ $this, 'the_notices' ] );
-
-		// Print the script to the footer.
-		add_action( 'admin_footer', [ $this, 'print_scripts' ] );
 	}
 
 	/**
@@ -115,21 +112,4 @@ public function the_notices() {
 			$notice->the_notice();
 		}
 	}
-
-	/**
-	 * Prints scripts for the notices.
-	 *
-	 * @access public
-	 * @since 1.0
-	 * @return void
-	 */
-	public function print_scripts() {
-		$notices = $this->get_all();
-
-		foreach ( $notices as $notice ) {
-			if ( $notice->show() ) {
-				$notice->dismiss->print_script();
-			}
-		}
-	}
 }