Changeset 40019

Timestamp:

01/27/2017 04:24:58 AM (8 years ago)

Author:

azaozz

Message:

TinyMCE: improve the previews for embedded WordPress posts:

• Add option to force a sandbox iframe in wpview.
• Use it to show the embedded post preview.
• Remove the deprecated wpembed plugin.js

Fixes #39513.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/js/mce-view.js (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wpembed (deleted)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3005 +3005 @@
     }
 
-
     if ( ! empty( $no_ssl_support ) || ( is_ssl() && ( preg_match( '%<(iframe|script|embed) [^>]*src="http://%', $parsed ) ||
         preg_match( '%<link [^>]*href="http://%', $parsed ) ) ) ) {
@@ -3015 +3014 @@
     }
 
-    wp_send_json_success( array(
+    $return = array(
         'body' => $parsed,
         'attr' => $wp_embed->last_attr
-    ) );
+    );
+
+    if ( strpos( $parsed, 'class="wp-embedded-content' ) ) {
+        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+            $script_src = includes_url( 'js/wp-embed.js' );
+        } else {
+            $script_src = includes_url( 'js/wp-embed.min.js' );
+        }
+
+        $return['head'] = '<script src="' . $script_src . '"></script>';
+        $return['sandbox'] = true;
+    }
+
+    wp_send_json_success( $return );
 }
 

trunk/src/wp-includes/class-wp-editor.php

@@ -418 +418 @@
                         'wptextpattern',
                         'wpview',
-                        'wpembed',
                     );
 

trunk/src/wp-includes/js/mce-view.js

@@ -469 +469 @@
          */
         setContent: function( content, callback, rendered ) {
-            if ( _.isObject( content ) && content.body.indexOf( '<script' ) !== -1 ) {
+            if ( _.isObject( content ) && ( content.sandbox || content.head || content.body.indexOf( '<script' ) !== -1 ) ) {
                 this.setIframes( content.head || '', content.body, callback, rendered );
             } else if ( _.isString( content ) && content.indexOf( '<script' ) !== -1 ) {
@@ -585 +585 @@
                                     'content: "";' +
                                 '}' +
+                                'iframe {' +
+                                    'max-width: 100%;' +
+                                '}' +
                             '</style>' +
                         '</head>' +
@@ -624 +627 @@
 
                 function reload() {
-                    $( node ).data( 'rendered', null );
-
-                    setTimeout( function() {
-                        wp.mce.views.render();
-                    } );
-                }
-
-                $( iframeWin ).on( 'load', resize ).on( 'unload', reload );
-
-                MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
-
-                if ( MutationObserver ) {
+                    if ( ! editor.isHidden() ) {
+                        $( node ).data( 'rendered', null );
+
+                        setTimeout( function() {
+                            wp.mce.views.render();
+                        } );
+                    }
+                }
+
+                function addObserver() {
                     observer = new MutationObserver( _.debounce( resize, 100 ) );
 
@@ -643 +644 @@
                         subtree: true
                     } );
+                }
+
+                $( iframeWin ).on( 'load', resize ).on( 'unload', reload );
+
+                MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
+
+                if ( MutationObserver ) {
+                    if ( ! iframeDoc.body ) {
+                        iframeDoc.addEventListener( 'DOMContentLoaded', addObserver, false );
+                    } else {
+                        addObserver();
+                    }
                 } else {
                     for ( i = 1; i < 6; i++ ) {