Changeset 41441 for branches/4.2

Timestamp:

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

Author:

ocean90

Message:

TinyMCE: Improve the previews for shortcodes.

Merge of [41395] to the 4.2 branch.

Location:

branches/4.2

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.2/src/wp-includes/js/mce-view.js

@@ -157 +157 @@
                                 instance;
 
-                        text = tinymce.DOM.decode( text );
                         instance = this.getInstance( text );
 
@@ -419 +418 @@
                 replaceMarkers: function() {
                         this.getMarkers( function( editor, node ) {
-                                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;
@@ -487 +486 @@
                         var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
                                 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, contentNode ) {

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

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