<!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>[29187] trunk/src/wp-includes: Cleanup after [29179]:</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/29187">29187</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-16 15:39:05 +0000 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup after <a href="http://core.trac.wordpress.org/changeset/29179">[29179]</a>:
* `_WP_Editors::editor_settings()` no longer needs to load MEjs styles
* Make sure each identical shortcode with multiple instances also has an iframe sandbox for each instance
* For the time being, make audio and video shortcodes bypass the loading placeholder to avoid whiplash visually
Props avryl, wonderboymusic.
See <a href="http://core.trac.wordpress.org/ticket/28905">#28905</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (29186 => 29187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php 2014-07-16 04:05:13 UTC (rev 29186)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-07-16 15:39:05 UTC (rev 29187)
</span><span class="lines">@@ -503,14 +503,10 @@
</span><span class="cx"> $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
</span><span class="cx"> $version = 'ver=' . $GLOBALS['wp_version'];
</span><span class="cx"> $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
</span><del>- $mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
- $wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
</del><span class="cx">
</span><span class="cx"> // WordPress default stylesheet and dashicons
</span><span class="cx"> $mce_css = array(
</span><span class="cx"> $dashicons,
</span><del>- $mediaelement,
- $wpmediaelement,
</del><span class="cx"> self::$baseurl . '/skins/wordpress/wp-content.css?' . $version
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (29186 => 29187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-07-16 04:05:13 UTC (rev 29186)
+++ trunk/src/wp-includes/js/mce-view.js 2014-07-16 15:39:05 UTC (rev 29187)
</span><span class="lines">@@ -69,95 +69,115 @@
</span><span class="cx"> );
</span><span class="cx"> },
</span><span class="cx"> unbind: function() {},
</span><del>- setContent: function( html, callback, option ) {
</del><ins>+ getNodes: function( callback ) {
+ var nodes = [];
+
</ins><span class="cx"> _.each( tinymce.editors, function( editor ) {
</span><del>- var self = this;
</del><span class="cx"> if ( editor.plugins.wpview ) {
</span><span class="cx"> $( editor.getBody() )
</span><span class="cx"> .find( '[data-wpview-text="' + this.encodedText + '"]' )
</span><del>- .each( function ( i, element ) {
- var contentWrap = $( element ).find( '.wpview-content' ),
- wrap = element;
-
- if ( contentWrap.length && option !== 'wrap' ) {
- element = contentWrap = contentWrap[0];
</del><ins>+ .each( function ( i, node ) {
+ if ( callback ) {
+ callback( editor, node );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( _.isString( html ) ) {
- if ( option === 'replace' ) {
- element = editor.dom.replace( editor.dom.createFragment( html ), wrap );
- } else {
- editor.dom.setHTML( element, html );
- }
- } else {
- if ( option === 'replace' ) {
- element = editor.dom.replace( html, wrap );
- } else {
- $( element ).empty().append( html );
- }
- }
-
- if ( _.isFunction( callback ) ) {
- callback( self, editor, $( element ).find( '.wpview-content' )[0] );
- }
</del><ins>+ nodes.push( node );
</ins><span class="cx"> } );
</span><span class="cx"> }
</span><span class="cx"> }, this );
</span><ins>+
+ return nodes;
</ins><span class="cx"> },
</span><ins>+ setContent: function( html, callback, option ) {
+ var self = this;
</ins><span class="cx">
</span><ins>+ this.getNodes( function ( editor, element ) {
+ var contentWrap = $( element ).find( '.wpview-content' ),
+ wrap = element;
+
+ if ( contentWrap.length && option !== 'wrap' ) {
+ element = contentWrap = contentWrap[0];
+ }
+
+ if ( _.isString( html ) ) {
+ if ( option === 'replace' ) {
+ element = editor.dom.replace( editor.dom.createFragment( html ), wrap );
+ } else {
+ editor.dom.setHTML( element, html );
+ }
+ } else {
+ if ( option === 'replace' ) {
+ element = editor.dom.replace( html, wrap );
+ } else {
+ $( element ).empty().append( html );
+ }
+ }
+
+ if ( _.isFunction( callback ) ) {
+ callback( self, editor, $( element ).find( '.wpview-content' )[0] );
+ }
+ } );
+ },
+
</ins><span class="cx"> /* jshint scripturl: true */
</span><span class="cx"> createIframe: function ( content ) {
</span><del>- var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
- iframe, iframeDoc, i, resize,
- dom = tinymce.DOM;
</del><ins>+ var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
</ins><span class="cx">
</span><span class="cx"> if ( content.indexOf( '<script' ) !== -1 ) {
</span><del>- iframe = dom.create( 'iframe', {
- src: tinymce.Env.ie ? 'javascript:""' : '',
- frameBorder: '0',
- allowTransparency: 'true',
- scrolling: 'no',
- style: {
- width: '100%',
- display: 'block'
- }
- } );
</del><ins>+ this.getNodes( function ( editor, node ) {
+ var dom = editor.dom,
+ iframe, iframeDoc, i, resize;
</ins><span class="cx">
</span><del>- this.setContent( iframe );
- iframeDoc = iframe.contentWindow.document;
</del><ins>+ node = $( node ).find( '.wpview-content' )[0];
</ins><span class="cx">
</span><del>- iframeDoc.open();
- iframeDoc.write(
- '<!DOCTYPE html>' +
- '<html>' +
- '<head>' +
- '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
- '</head>' +
- '<body style="padding: 0; margin: 0;" class="' + dom.doc.body.className + '">' +
- content +
- '</body>' +
- '</html>'
- );
- iframeDoc.close();
</del><ins>+ node.innerHTML = '';
</ins><span class="cx">
</span><del>- resize = function() {
- $( iframe ).height( $( iframeDoc.body ).height() );
- };
</del><ins>+ iframe = dom.add( node, 'iframe', {
+ src: tinymce.Env.ie ? 'javascript:""' : '',
+ frameBorder: '0',
+ allowTransparency: 'true',
+ scrolling: 'no',
+ style: {
+ width: '100%',
+ display: 'block'
+ }
+ } );
</ins><span class="cx">
</span><del>- if ( MutationObserver ) {
- new MutationObserver( _.debounce( function() {
- resize();
- }, 100 ) )
- .observe( iframeDoc.body, {
- attributes: true,
- childList: true,
- subtree: true
- } );
- } else {
- for ( i = 1; i < 6; i++ ) {
- setTimeout( resize, i * 700 );
</del><ins>+ iframeDoc = iframe.contentWindow.document;
+
+ iframeDoc.open();
+ iframeDoc.write(
+ '<!DOCTYPE html>' +
+ '<html>' +
+ '<head>' +
+ '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
+ '</head>' +
+ '<body style="padding: 0; margin: 0;" class="' + /* editor.getBody().className + */ '">' +
+ content +
+ '</body>' +
+ '</html>'
+ );
+ iframeDoc.close();
+
+ resize = function() {
+ $( iframe ).height( $( iframeDoc.body ).height() );
+ };
+
+ if ( MutationObserver ) {
+ new MutationObserver( _.debounce( function() {
+ resize();
+ }, 100 ) )
+ .observe( iframeDoc.body, {
+ attributes: true,
+ childList: true,
+ subtree: true
+ } );
+ } else {
+ for ( i = 1; i < 6; i++ ) {
+ setTimeout( resize, i * 700 );
+ }
</ins><span class="cx"> }
</span><del>- }
</del><ins>+ });
</ins><span class="cx"> } else {
</span><span class="cx"> this.setContent( content );
</span><span class="cx"> }
</span><span class="lines">@@ -478,8 +498,6 @@
</span><span class="cx"> * @mixin
</span><span class="cx"> */
</span><span class="cx"> wp.mce.av = {
</span><del>- loaded: false,
-
</del><span class="cx"> View: {
</span><span class="cx"> overlay: true,
</span><span class="cx">
</span><span class="lines">@@ -537,13 +555,13 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Pass data to the View's Underscore template and return the compiled output
</del><ins>+ * Return parsed response
</ins><span class="cx"> *
</span><span class="cx"> * @returns {string}
</span><span class="cx"> */
</span><span class="cx"> getHtml: function() {
</span><span class="cx"> if ( ! this.parsed ) {
</span><del>- return '';
</del><ins>+ return ' ';
</ins><span class="cx"> }
</span><span class="cx"> return this.parsed;
</span><span class="cx"> }
</span><span class="lines">@@ -639,6 +657,18 @@
</span><span class="cx">
</span><span class="cx"> _.bindAll( this, 'createIframe', 'setNode', 'fetch' );
</span><span class="cx"> $( this ).on( 'ready', this.setNode );
</span><ins>+ },
+
+ /**
+ * Return parsed response
+ *
+ * @returns {string}
+ */
+ getHtml: function() {
+ if ( ! this.parsed ) {
+ return '';
+ }
+ return this.parsed;
</ins><span class="cx"> }
</span><span class="cx"> } ),
</span><span class="cx"> edit: function( node ) {
</span></span></pre>
</div>
</div>
</body>
</html>