Changeset 31740

Timestamp:

03/11/2015 11:52:15 PM (12 years ago)

Author:

azaozz

Message:

TinyMCE: improve setting of the sandboxing iframe inside a view.
Props mattheu, iseulde. Fixes #31412.

File:

• trunk/src/wp-includes/js/mce-view.js (modified) (3 diffs)

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

@@ -434 +434 @@
                 setContent: function( content, callback, rendered ) {
                         if ( _.isObject( content ) && content.body.indexOf( '<script' ) !== -1 ) {
-                                this.setIframes( content.head, content.body, callback, rendered );
+                                this.setIframes( content.head || '', content.body, callback, rendered );
                         } else if ( _.isString( content ) && content.indexOf( '<script' ) !== -1 ) {
-                                this.setIframes( null, content, callback, rendered );
+                                this.setIframes( '', content, callback, rendered );
                         } else {
                                 this.getNodes( function( editor, node, contentNode ) {
@@ -466 +466 @@
 
                         this.getNodes( function( editor, node, content ) {
-                                var dom = editor.dom,
-                                        styles = '',
-                                        bodyClasses = editor.getBody().className || '',
-                                        iframe, iframeDoc, observer, i;
-
-                                content.innerHTML = '';
-                                head = head || '';
-
-                                if ( importStyles ) {
-                                        if ( ! wp.mce.views.sandboxStyles ) {
-                                                tinymce.each( dom.$( 'link[rel="stylesheet"]', editor.getDoc().head ), function( link ) {
-                                                        if ( link.href && link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 &&
-                                                                link.href.indexOf( 'skins/wordpress/wp-content.css' ) === -1 ) {
-
-                                                                styles += dom.getOuterHTML( link ) + '\n';
-                                                        }
-                                                });
-
-                                                wp.mce.views.sandboxStyles = styles;
-                                        } else {
-                                                styles = wp.mce.views.sandboxStyles;
-                                        }
-                                }
-
                                 // Seems Firefox needs a bit of time to insert/set the view nodes,
                                 // or the iframe will fail especially when switching Text => Visual.
                                 setTimeout( function() {
+                                        var dom = editor.dom,
+                                                styles = '',
+                                                bodyClasses = editor.getBody().className || '',
+                                                iframe, iframeDoc, observer, i;
+
+                                        if ( importStyles ) {
+                                                if ( ! wp.mce.views.sandboxStyles ) {
+                                                        tinymce.each( dom.$( 'link[rel="stylesheet"]', editor.getDoc().head ), function( link ) {
+                                                                if ( link.href && link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 &&
+                                                                        link.href.indexOf( 'skins/wordpress/wp-content.css' ) === -1 ) {
+
+                                                                        styles += dom.getOuterHTML( link ) + '\n';
+                                                                }
+                                                        });
+
+                                                        wp.mce.views.sandboxStyles = styles;
+                                                } else {
+                                                        styles = wp.mce.views.sandboxStyles;
+                                                }
+                                        }
+
+                                        content.innerHTML = '';
+
                                         iframe = dom.add( content, 'iframe', {
                                                 /* jshint scripturl: true */
@@ -589 +588 @@
                                                 } );
                                         }
+
+                                        callback && callback.apply( this, arguments );
                                 }, 50 );
-
-                                callback && callback.apply( this, arguments );
                         }, rendered );
                 },