Changeset 31742

Timestamp:

03/12/2015 01:04:59 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE wpViews: always import the non-default editor styles in the sandbox iframe in views.
Props iseulde, mattheu. Fixes #31464.

File:

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

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

@@ -462 +462 @@
          */
         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 ) {
@@ -474 +473 @@
                         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;
+                    tinymce.each( dom.$(
+                        'link[rel="stylesheet"]',
+                        editor.getDoc().getElementsByTagName( 'head' )[0]
+                    ), function( link ) {
+                        if (
+                            link.href &&
+                            link.href.indexOf( 'skins/lightgray/content.min.css' ) >= 0 &&
+                            link.href.indexOf( 'skins/wordpress/wp-content.css' ) >= 0
+                        ) {
+                            styles += dom.getOuterHTML( link );
                         }
-                    }
+                    } );
 
                     content.innerHTML = '';
@@ -581 +577 @@
                     }
 
-                    if ( importStyles ) {
-                        editor.on( 'wp-body-class-change', classChange );
-
-                        $( node ).one( 'wp-mce-view-unbind', function() {
-                            editor.off( 'wp-body-class-change', classChange );
-                        } );
-                    }
+                    editor.on( 'wp-body-class-change', classChange );
+
+                    $( node ).one( 'wp-mce-view-unbind', function() {
+                        editor.off( 'wp-body-class-change', classChange );
+                    } );
 
                     callback && callback.apply( this, arguments );