Changeset 41443

Timestamp:

09/19/2017 12:40:31 PM (9 years ago)

Author:

ocean90

Message:

TinyMCE: Improve the previews for shortcodes.

Merge of [41395] to the 4.0 branch.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/wp-includes/js/mce-view.js (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (1 diff)

branches/4.0/src/wp-includes/js/mce-view.js

@@ -129 +129 @@
 
                         if ( head || body.indexOf( '<script' ) !== -1 ) {
+                                if ( body.indexOf( '[' ) !== -1 && body.indexOf( ']' ) !== -1 ) {
+                                        var shortcodesRegExp = new RegExp( '\\[\\/?(?:' + window.mceViewL10n.shortcodes.join( '|' ) + ')[^\\]]*?\\]', 'g' );
+                                        // Escape tags inside shortcode previews.
+                                        body = body.replace( shortcodesRegExp, function( match ) {
+                                                return match.replace( /</g, '&lt;' ).replace( />/g, '&gt;' );
+                                        } );
+                                }
+
                                 this.getNodes( function ( editor, node, content ) {
                                         var dom = editor.dom,

branches/4.0/src/wp-includes/script-loader.php

@@ -703 +703 @@
         ) );
 
+        wp_localize_script( 'mce-view', 'mceViewL10n', array(
+                'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
+        ) );
 }