<!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>[40019] trunk/src: TinyMCE: improve the previews for embedded WordPress posts:</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40019">40019</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40019","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-27 04:24:58 +0000 (Fri, 27 Jan 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>TinyMCE: improve the previews for embedded WordPress posts:
- Add option to force a sandbox iframe in wpview.
- Use it to show the embedded post preview.
- Remove the deprecated `wpembed` plugin.js
Fixes <a href="https://core.trac.wordpress.org/ticket/39513">#39513</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<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>
<h3>Removed Paths</h3>
<ul>
<li>trunk/src/wp-includes/js/tinymce/plugins/wpembed/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2017-01-26 21:57:54 UTC (rev 40018)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2017-01-27 04:24:58 UTC (rev 40019)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3004,7 +3004,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = $styles . $html . $scripts;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $no_ssl_support ) || ( is_ssl() && ( preg_match( '%<(iframe|script|embed) [^>]*src="http://%', $parsed ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '%<link [^>]*href="http://%', $parsed ) ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Admin is ssl and the embed is not. Iframes, scripts, and other "active content" will be blocked.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3014,10 +3013,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_success( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'body' => $parsed,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attr' => $wp_embed->last_attr
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
+
+ if ( strpos( $parsed, 'class="wp-embedded-content' ) ) {
+ if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+ $script_src = includes_url( 'js/wp-embed.js' );
+ } else {
+ $script_src = includes_url( 'js/wp-embed.min.js' );
+ }
+
+ $return['head'] = '<script src="' . $script_src . '"></script>';
+ $return['sandbox'] = true;
+ }
+
+ wp_send_json_success( $return );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2017-01-26 21:57:54 UTC (rev 40018)
+++ trunk/src/wp-includes/class-wp-editor.php 2017-01-27 04:24:58 UTC (rev 40019)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpdialogs',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wptextpattern',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpview',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wpembed',
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! self::$has_medialib ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/mce-view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/mce-view.js 2017-01-26 21:57:54 UTC (rev 40018)
+++ trunk/src/wp-includes/js/mce-view.js 2017-01-27 04:24:58 UTC (rev 40019)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {Boolean} rendered Only set for (un)rendered nodes. Optional.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> setContent: function( content, callback, rendered ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( _.isObject( content ) && content.body.indexOf( '<script' ) !== -1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( _.isObject( content ) && ( content.sandbox || content.head || content.body.indexOf( '<script' ) !== -1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.setIframes( content.head || '', content.body, callback, rendered );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( _.isString( content ) && content.indexOf( '<script' ) !== -1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.setIframes( '', content, callback, rendered );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,6 +584,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'display: none;' +
</span><span class="cx" style="display: block; padding: 0 10px"> 'content: "";' +
</span><span class="cx" style="display: block; padding: 0 10px"> '}' +
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'iframe {' +
+ 'max-width: 100%;' +
+ '}' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '</style>' +
</span><span class="cx" style="display: block; padding: 0 10px"> '</head>' +
</span><span class="cx" style="display: block; padding: 0 10px"> '<body id="wpview-iframe-sandbox" class="' + bodyClasses + '">' +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,18 +626,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function reload() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( node ).data( 'rendered', null );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! editor.isHidden() ) {
+ $( node ).data( 'rendered', null );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setTimeout( function() {
- wp.mce.views.render();
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( function() {
+ wp.mce.views.render();
+ } );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( iframeWin ).on( 'load', resize ).on( 'unload', reload );
-
- MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
-
- if ( MutationObserver ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function addObserver() {
</ins><span class="cx" style="display: block; padding: 0 10px"> observer = new MutationObserver( _.debounce( resize, 100 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> observer.observe( iframeDoc.body, {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,6 +643,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> childList: true,
</span><span class="cx" style="display: block; padding: 0 10px"> subtree: true
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ $( iframeWin ).on( 'load', resize ).on( 'unload', reload );
+
+ MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
+
+ if ( MutationObserver ) {
+ if ( ! iframeDoc.body ) {
+ iframeDoc.addEventListener( 'DOMContentLoaded', addObserver, false );
+ } else {
+ addObserver();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> for ( i = 1; i < 6; i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( resize, i * 700 );
</span></span></pre>
</div>
</div>
</body>
</html>