Ticket #31464: 31464.patch

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

@@ -28 +28 @@
         'use strict';
 
         var views = {},
-                instances = {};
+                instances = {},
+                cache;
 
         wp.mce = wp.mce || {};
 
@@ -434 +435 @@
                         if ( _.isObject( content ) && content.body.indexOf( '<script' ) !== -1 ) {
                                 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 ) {
                                         content = content.body || content;
@@ -460 +461 @@
                  * @param {Boolean}  rendered Only set for (un)rendered nodes. Optional.
                  */
                 setIframes: function( head, body, callback, rendered ) {
-                        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
-                                importStyles = this.type === 'video' || this.type === 'audio' || this.type === 'playlist';
+                        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
 
                         this.getNodes( function( editor, node, content ) {
                                 var dom = editor.dom,
-                                        styles = '',
                                         bodyClasses = editor.getBody().className || '',
                                         iframe, iframeDoc, observer, i, resize;
 
                                 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;
-                                        }
+                                if ( ! cache.sandboxStyles ) {
+                                        tinymce.each( dom.$(
+                                                'link[rel="stylesheet"]',
+                                                editor.getDoc().getElementsByTagName( 'head' )[0]
+                                        ), function( link ) {
+                                                if (
+                                                        link.href &&
+                                                        link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 &&
+                                                        link.href.indexOf( 'skins/wordpress/wp-content.css' ) === -1
+                                                ) {
+                                                        cache.sandboxStyles += dom.getOuterHTML( link ) + '\n';
+                                                }
+                                        } );
                                 }
 
                                 // Seems Firefox needs a bit of time to insert/set the view nodes,
@@ -516 +513 @@
                                                         '<head>' +
                                                                 '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
                                                                 head +
-                                                                styles +
+                                                                cache.sandboxStyles +
                                                                 '<style>' +
                                                                         'html {' +
                                                                                 'background: transparent;' +
@@ -578 +575 @@
                                                 iframeDoc.body.className = editor.getBody().className;
                                         }
 
-                                        if ( importStyles ) {
-                                                editor.on( 'wp-body-class-change', classChange );
-                                        }
+                                        editor.on( 'wp-body-class-change', classChange );
 
                                         $( node ).one( 'wp-mce-view-unbind', function() {
                                                 observer.disconnect();