<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29615] trunk/src: MCE View sandboxes:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29615">29615</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-08-26 04:45:54 +0000 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>MCE View sandboxes:
* Use a `MutationObserver` to listen to the `body` class of the parent editor frame.
* In `wpview_media_sandbox_styles()`, only return the MEjs stylesheets.
* In `wp_ajax_parse_media_shortcode()` and `wp_ajax_parse_embed()`, return an object instead of an HTML blob to allow passing `body` and `head` separately
Props avryl, azaozz.
Fixes <a href="http://core.trac.wordpress.org/ticket/29048">#29048</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaelementwpmediaelementcss">trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (29614 => 29615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-08-26 04:36:53 UTC (rev 29614)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-08-26 04:45:54 UTC (rev 29615)
</span><span class="lines">@@ -2705,7 +2705,9 @@
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wp_send_json_success( $parsed );
</del><ins>+ wp_send_json_success( array(
+ 'body' => $parsed
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_ajax_parse_media_shortcode() {
</span><span class="lines">@@ -2729,19 +2731,21 @@
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ob_start();
</del><ins>+ $head = '';
+ $styles = wpview_media_sandbox_styles();
</ins><span class="cx">
</span><del>- $styles = wpview_media_sandbox_styles();
</del><span class="cx"> foreach ( $styles as $style ) {
</span><del>- printf( '<link rel="stylesheet" href="%s"/>', $style );
</del><ins>+ $head .= '<link type="text/css" rel="stylesheet" href="' . $style . '">';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- echo $shortcode;
-
</del><span class="cx"> if ( ! empty( $wp_scripts ) ) {
</span><span class="cx"> $wp_scripts->done = array();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ob_start();
+
+ echo $shortcode;
+
</ins><span class="cx"> if ( 'playlist' === $_REQUEST['type'] ) {
</span><span class="cx"> wp_underscore_playlist_templates();
</span><span class="cx">
</span><span class="lines">@@ -2750,5 +2754,8 @@
</span><span class="cx"> wp_print_scripts( 'wp-mediaelement' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wp_send_json_success( ob_get_clean() );
</del><ins>+ wp_send_json_success( array(
+ 'head' => $head,
+ 'body' => ob_get_clean()
+ ) );
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (29614 => 29615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-08-26 04:36:53 UTC (rev 29614)
+++ trunk/src/wp-includes/js/mce-view.js 2014-08-26 04:45:54 UTC (rev 29615)
</span><span class="lines">@@ -123,16 +123,35 @@
</span><span class="cx"> } );
</span><span class="cx"> },
</span><span class="cx"> /* jshint scripturl: true */
</span><del>- setIframes: function ( html ) {
- var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
</del><ins>+ setIframes: function ( head, body ) {
+ var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
+ importStyles = this.type === 'video' || this.type === 'audio' || this.type === 'playlist';
</ins><span class="cx">
</span><del>- if ( html.indexOf( '<script' ) !== -1 ) {
</del><ins>+ if ( head || body.indexOf( '<script' ) !== -1 ) {
</ins><span class="cx"> this.getNodes( function ( editor, node, content ) {
</span><span class="cx"> var dom = editor.dom,
</span><ins>+ styles = '',
+ bodyClasses = editor.getBody().className || '',
</ins><span class="cx"> iframe, iframeDoc, i, resize;
</span><span class="cx">
</span><span class="cx"> content.innerHTML = '';
</span><span class="cx">
</span><ins>+ 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;
+ }
+ }
+
</ins><span class="cx"> // Seems Firefox needs a bit of time to insert/set the view nodes, or the iframe will fail
</span><span class="cx"> // especially when switching Text => Visual.
</span><span class="cx"> setTimeout( function() {
</span><span class="lines">@@ -156,6 +175,8 @@
</span><span class="cx"> '<html>' +
</span><span class="cx"> '<head>' +
</span><span class="cx"> '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
</span><ins>+ head +
+ styles +
</ins><span class="cx"> '<style>' +
</span><span class="cx"> 'html {' +
</span><span class="cx"> 'background: transparent;' +
</span><span class="lines">@@ -164,13 +185,18 @@
</span><span class="cx"> '}' +
</span><span class="cx"> 'body#wpview-iframe-sandbox {' +
</span><span class="cx"> 'background: transparent;' +
</span><del>- 'padding: 1px 0;' +
- 'margin: -1px 0 0;' +
</del><ins>+ 'padding: 1px 0 !important;' +
+ 'margin: -1px 0 0 !important;' +
</ins><span class="cx"> '}' +
</span><ins>+ 'body#wpview-iframe-sandbox:before,' +
+ 'body#wpview-iframe-sandbox:after {' +
+ 'display: none;' +
+ 'content: "";' +
+ '}' +
</ins><span class="cx"> '</style>' +
</span><span class="cx"> '</head>' +
</span><del>- '<body id="wpview-iframe-sandbox">' +
- html +
</del><ins>+ '<body id="wpview-iframe-sandbox" class="' + bodyClasses + '">' +
+ body +
</ins><span class="cx"> '</body>' +
</span><span class="cx"> '</html>'
</span><span class="cx"> );
</span><span class="lines">@@ -195,10 +221,16 @@
</span><span class="cx"> setTimeout( resize, i * 700 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if ( importStyles ) {
+ editor.on( 'wp-body-class-change', function() {
+ iframeDoc.body.className = editor.getBody().className;
+ });
+ }
</ins><span class="cx"> }, 50 );
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><del>- this.setContent( html );
</del><ins>+ this.setContent( body );
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> setError: function( message, dashicon ) {
</span><span class="lines">@@ -560,7 +592,7 @@
</span><span class="cx">
</span><span class="cx"> setNodes: function () {
</span><span class="cx"> if ( this.parsed ) {
</span><del>- this.setIframes( this.parsed );
</del><ins>+ this.setIframes( this.parsed.head, this.parsed.body );
</ins><span class="cx"> } else {
</span><span class="cx"> this.fail();
</span><span class="cx"> }
</span><span class="lines">@@ -579,7 +611,7 @@
</span><span class="cx"> .done( function( response ) {
</span><span class="cx"> if ( response ) {
</span><span class="cx"> self.parsed = response;
</span><del>- self.setIframes( response );
</del><ins>+ self.setIframes( response.head, response.body );
</ins><span class="cx"> } else {
</span><span class="cx"> self.fail( true );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaelementwpmediaelementcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css (29614 => 29615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css 2014-08-26 04:36:53 UTC (rev 29614)
+++ trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css 2014-08-26 04:45:54 UTC (rev 29615)
</span><span class="lines">@@ -1,10 +1,3 @@
</span><del>-#wpview-iframe-sandbox {
- color: #444;
- font-family: "Open Sans", sans-serif;
- font-size: 13px;
- line-height: 1.4em;
-}
-
</del><span class="cx"> .mejs-container {
</span><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="lines">@@ -278,4 +271,4 @@
</span><span class="cx">
</span><span class="cx"> .wp-audio-playlist .me-cannotplay span {
</span><span class="cx"> padding: 5px 15px;
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (29614 => 29615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-08-26 04:36:53 UTC (rev 29614)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-08-26 04:45:54 UTC (rev 29615)
</span><span class="lines">@@ -260,7 +260,8 @@
</span><span class="cx">
</span><span class="cx"> editor.on( 'init', function() {
</span><span class="cx"> var scrolled = false,
</span><del>- selection = editor.selection;
</del><ins>+ selection = editor.selection,
+ MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
</ins><span class="cx">
</span><span class="cx"> // When a view is selected, ensure content that is being pasted
</span><span class="cx"> // or inserted is added to a text node (instead of the view).
</span><span class="lines">@@ -333,6 +334,16 @@
</span><span class="cx"> scrolled = false;
</span><span class="cx"> }
</span><span class="cx"> }, true );
</span><ins>+
+ if ( MutationObserver ) {
+ new MutationObserver( function() {
+ editor.fire( 'wp-body-class-change' );
+ } )
+ .observe( editor.getBody(), {
+ attributes: true,
+ attributeFilter: ['class']
+ } );
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.on( 'PreProcess', function( event ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (29614 => 29615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-08-26 04:36:53 UTC (rev 29614)
+++ trunk/src/wp-includes/media.php 2014-08-26 04:45:54 UTC (rev 29615)
</span><span class="lines">@@ -3310,19 +3310,8 @@
</span><span class="cx"> */
</span><span class="cx"> function wpview_media_sandbox_styles() {
</span><span class="cx"> $version = 'ver=' . $GLOBALS['wp_version'];
</span><del>- $open_sans = "//fonts.googleapis.com/css?family=Open+Sans%3A300italic%2C400italic%2C600italic%2C300%2C400%2C600&subset=latin%2Clatin-ext&ver=$version";
- $dashicons = includes_url( "css/dashicons.css?$version" );
</del><span class="cx"> $mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
</span><span class="cx"> $wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
</span><span class="cx">
</span><del>- /**
- * For use by themes that need to override the styling of MediaElement based previews in the Visual editor.
- * Not intended for adding editor-style.css. Ideally these styles will be applied by using
- * the 'seamless' iframe attribute in the future.
- *
- * @since 4.0
- *
- * @param array The URLs to the stylesheets that will be loaded in the sandbox iframe.
- */
- return apply_filters( 'wpview_media_sandbox_styles', array( $open_sans, $dashicons, $mediaelement, $wpmediaelement ) );
</del><ins>+ return array( $mediaelement, $wpmediaelement );
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>