Changeset 41436 for branches/4.7

Timestamp:

09/19/2017 12:40:10 PM (8 years ago)

Author:

ocean90

Message:

TinyMCE: Improve the previews for shortcodes.

Merge of [41395] to the 4.7 branch.

Location:

branches/4.7

Files:

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

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

@@ -156 +156 @@
                 instance;
 
-            text = tinymce.DOM.decode( text );
-
             if ( text.indexOf( '[' ) !== -1 && text.indexOf( ']' ) !== -1 ) {
                 // Looks like a shortcode? Remove any line breaks from inside of shortcodes
@@ -431 +429 @@
                 var $viewNode;
 
-                if ( ! this.loader && $( node ).text() !== this.text ) {
+                if ( ! this.loader && $( node ).text() !== tinymce.DOM.decode( this.text ) ) {
                     editor.dom.setAttrib( node, 'data-wpview-marker', null );
                     return;
@@ -494 +492 @@
         setIframes: function( head, body, callback, rendered ) {
             var self = this;
+
+            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 ) {

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

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