Updated editor JavaScript for WordPress 4.3. Props Andrew Ozz (@azaozz). Bump version to 3.1.12.

Author: Viper007Bond

readme.txt

@@ -3,7 +3,7 @@ Contributors: Viper007Bond, automattic
 Donate link: http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/donate/
 Tags: code, sourcecode, php, xhtml, html, css, WordPress.com
 Requires at least: 2.7
-Tested up to: 4.2
+Tested up to: 4.3
 Stable tag: trunk
 
 Easily post syntax-highlighted code to your site without having to modify the code at all. As seen on WordPress.com.
@@ -55,6 +55,10 @@ Make sure your theme's `footer.php` file has `<?php wp_footer(); ?>` somewhere i
 
 == ChangeLog ==
 
+= Version 3.1.12 =
+
+* Updated editor JavaScript for WordPress 4.3. Props Andrew Ozz (@azaozz).
+
 = Version 3.1.11 =
 
 * SyntaxHighlighter 3.x: Fix table layout issue. Props jeherve.
@@ -242,9 +246,4 @@ Localizations:
 
 = Version 1.0.0 =
 
-* Initial release!
-
-== Upgrade Notice ==
-
-= 3.1.10 =
-Important security update.
+* Initial release!

syntaxhighlighter.js

@@ -1,21 +1,31 @@
 ( function($) {
-	var shortcodes = window.syntaxHLcodes || 'sourcecode';
+	var shortcodes = window.syntaxHLcodes || 'sourcecode',
+		regex = new RegExp( '(?:<pre>\\s*)?(\\[(' + shortcodes + ')[^\\]]*\\][\\s\\S]*?\\[\\/\\2\\])(?:\\s*<\\/pre>)?', 'gi' );
+
+	window.syntaxHLescape = {};
 
 	if ( typeof $ === 'undefined' ) {
 		return;
 	}
 
-	$(document).on( 'afterPreWpautop.syntaxhighlighter', function( event, obj ) {
-		obj.data = obj.data.replace( new RegExp( '(?:<pre>\\s*)?(\\[(' + shortcodes + ')[^\\]]*\\][\\s\\S]*?\\[\\/\\2\\])(?:\\s*<\\/pre>)?', 'gi' ),
-			function( match, shortcode ) {
-				return '\n' + shortcode.replace( /&lt;/g, '<' ).replace( /&gt;/g, '>' ).replace( /&amp;/g, '&' ) + '\n';
-			}
-		);
+	$( document ).on( 'afterPreWpautop.syntaxhighlighter', function( event, obj ) {
+		if ( obj.data && obj.data.indexOf( '[' ) !== -1 ) {
+			obj.data = obj.data.replace( regex, function( match, shortcode ) {
+					return '\n' + shortcode.replace( /&lt;/g, '<' ).replace( /&gt;/g, '>' ).replace( /&amp;/g, '&' ) + '\n';
+				}
+			);
+		}
 	}).on( 'beforeWpautop.syntaxhighlighter', function( event, obj ) {
-		obj.data = obj.data.replace( new RegExp( '\\[(' + shortcodes + ')[^\\]]*\\][\\s\\S]+?\\[\\/\\1\\]', 'gi' ),
-			function( match ) {
-				return '<pre>' + match.replace( /&/g, '&amp;' ).replace( /</g, '&lt;' ).replace( />/g, '&gt;' ) + '</pre>';
+		if ( obj.data && obj.data.indexOf( '[' ) !== -1 ) {
+			obj.data = obj.data.replace( regex, '<pre>$1</pre>' );
+		}
+	}).ready( function() {
+		$( '.wp-editor-wrap.html-active' ).each( function( i, element ) {
+			var id = $( element ).find( 'textarea.wp-editor-area' ).attr( 'id' );
+
+			if ( id ) {
+				window.syntaxHLescape[id] = true;
 			}
-		);
+		});
 	});
-}( window.jQuery ));
+}( window.jQuery ));

syntaxhighlighter.php

@@ -4,7 +4,7 @@
 
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/
-Version:      3.1.11
+Version:      3.1.12
 Description:  Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's <a href="http://alexgorbatchev.com/wiki/SyntaxHighlighter">SyntaxHighlighter</a>. <strong>TIP:</strong> Don't use the Visual editor if you don't want your code mangled. TinyMCE will "clean up" your HTML.
 Author:       Alex Mills (Viper007Bond)
 Author URI:   http://www.viper007bond.com/
@@ -21,7 +21,7 @@
 
 class SyntaxHighlighter {
 	// All of these variables are private. Filters are provided for things that can be modified.
-	var $pluginver            = '3.1.11';  // Plugin version
+	var $pluginver            = '3.1.12';  // Plugin version
 	var $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
 	var $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
 	var $settings             = array();  // Contains the user's settings

syntaxhighlighter_mce-4.js

@@ -4,12 +4,20 @@
  */
 tinymce.PluginManager.add( 'syntaxhighlighter', function( editor ) {
 	editor.on( 'BeforeSetContent', function( event ) {
-		var shortcodes = window.syntaxHLcodes || 'sourcecode';
+		var shortcodes = window.syntaxHLcodes || 'sourcecode',
+			regex = new RegExp( '(?:<p>\\s*)?(?:<pre>\\s*)?(\\[(' + shortcodes + ')[^\\]]*\\][\\s\\S]*?\\[\\/\\2\\])(?:\\s*<\\/pre>)?(?:\\s*<\\/p>)?', 'gi' );
 
-		event.content = event.content.replace( new RegExp( '(?:<p>\\s*)?(?:<pre>\\s*)?(\\[(' + shortcodes + ')[^\\]]*\\][\\s\\S]*?\\[\\/\\2\\])(?:\\s*<\\/pre>)?(?:\\s*<\\/p>)?', 'gi'),
-			function( match, shortcode ) {
-				return '<pre>' + shortcode.replace( /<br ?\/?>[\r\n]*/g, '<br />' ).replace( /<\/?p( [^>]*)?>[\r\n]*/g, '<br />' ) + '</pre>';
-			}
-		);
+		if ( event.content && event.content.indexOf( '[' ) !== -1 ) {
+			event.content = event.content.replace( regex, function( match, shortcode ) {
+				shortcode = shortcode.replace( /\r/, '' );
+				shortcode = shortcode.replace( /<br ?\/?>\n?/g, '\n' ).replace( /<\/?p( [^>]*)?>\n?/g, '\n' );
+
+				if ( ! event.initial || ( window.syntaxHLescape && window.syntaxHLescape[ editor.id ] ) ) {
+					shortcode = shortcode.replace( /&/g, '&amp;' ).replace( /</g, '&lt;' ).replace( />/g, '&gt;' );
+				}
+
+				return '<pre>' + shortcode + '</pre>';
+			});
+		}
 	});
-});
+});