Better JS for loading the CSS stylesheets. Fixes #77. Thanks @georgik.

Viper007Bond · Viper007Bond · commit 2f7e32e4d7a0 · 2019-01-11T16:31:13.000-08:00
diff --git a/syntaxhighlighter.php b/syntaxhighlighter.php
@@ -55,7 +55,6 @@ function __construct() {
 		add_filter( 'bp_get_the_topic_post_edit_text', array( $this, 'decode_shortcode_contents' ), 1 ); // BuddyPress
 
 		// Outputting SyntaxHighlighter's JS and CSS
-		add_action( 'wp_head', array( $this, 'output_header_placeholder' ), 15 );
 		add_action( 'admin_head', array( $this, 'output_header_placeholder' ), 15 ); // For comments
 		add_action( 'wp_footer', array( $this, 'maybe_output_scripts' ), 15 );
 		add_action( 'admin_footer', array( $this, 'maybe_output_scripts' ), 15 ); // For comments
@@ -323,7 +322,7 @@ function enqueue_block_editor_assets() {
 			'syntaxhighlighter-blocks',
 			plugins_url( 'dist/blocks.build.js', __FILE__ ),
 			array( 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-editor' ),
-			( defined( 'WP_DEBUG' ) && WP_DEBUG )
+			( ( defined( 'WP_DEBUG' ) && WP_DEBUG ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) )
 				? filemtime( plugin_dir_path( __FILE__ ) . 'dist/blocks.build.js' )
 				: $this->pluginver
 		);
@@ -889,13 +888,6 @@ function js_escape_singlequotes( $string ) {
 	}
 
 
-	// Output an anchor in the header for the Javascript to use.
-	// In the <head>, we don't know if we'll need this plugin's CSS and JavaScript yet but we will in the footer.
-	function output_header_placeholder() {
-		echo '<style type="text/css" id="syntaxhighlighteranchor"></style>' . "\n";
-	}
-
-
 	// Output any needed scripts. This is meant for the footer.
 	function maybe_output_scripts() {
 		global $wp_styles;
@@ -956,7 +948,7 @@ function maybe_output_scripts() {
 				corecss.rel = "stylesheet";
 				corecss.href = corecssurl;
 		}
-		document.getElementsByTagName("head")[0].insertBefore( corecss, document.getElementById("syntaxhighlighteranchor") );
+		document.head.appendChild( corecss );
 <?php
 		endif; // Endif $needcore
 
@@ -970,8 +962,7 @@ function maybe_output_scripts() {
 				themecss.rel = "stylesheet";
 				themecss.href = themecssurl;
 		}
-		//document.getElementById("syntaxhighlighteranchor").appendChild(themecss);
-		document.getElementsByTagName("head")[0].insertBefore( themecss, document.getElementById("syntaxhighlighteranchor") );
+		document.head.appendChild( themecss );
 <?php
 		endif; // Endif none != theme
 
@@ -1588,4 +1579,4 @@ function validate_settings( $settings ) {
 function SyntaxHighlighter() {
 	global $SyntaxHighlighter;
 	$SyntaxHighlighter = new SyntaxHighlighter();
-}
+}
