<!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>[31740] trunk/src/wp-includes/js/mce-view.js: TinyMCE: improve setting of the sandboxing iframe inside a view.</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/31740">31740</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/31740","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>2015-03-11 23:52:15 +0000 (Wed, 11 Mar 2015)</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 setting of the sandboxing iframe inside a view.
Props mattheu, iseulde. Fixes <a href="https://core.trac.wordpress.org/ticket/31412">#31412</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-03-11 23:36:23 UTC (rev 31739)
+++ trunk/src/wp-includes/js/mce-view.js 2015-03-11 23:52:15 UTC (rev 31740)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,9 +433,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( _.isObject( content ) && content.body.indexOf( '<script' ) !== -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setIframes( content.head, content.body, callback, rendered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setIframes( content.head || '', content.body, callback, rendered );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( _.isString( content ) && content.indexOf( '<script' ) !== -1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setIframes( null, content, callback, rendered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setIframes( '', content, callback, rendered );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.getNodes( function( editor, node, contentNode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> content = content.body || content;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,33 +465,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> importStyles = this.type === 'video' || this.type === 'audio' || this.type === 'playlist';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.getNodes( function( editor, node, content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var dom = editor.dom,
- styles = '',
- bodyClasses = editor.getBody().className || '',
- iframe, iframeDoc, observer, i;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Seems Firefox needs a bit of time to insert/set the view nodes,
+ // or the iframe will fail especially when switching Text => Visual.
+ setTimeout( function() {
+ var dom = editor.dom,
+ styles = '',
+ bodyClasses = editor.getBody().className || '',
+ iframe, iframeDoc, observer, i;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.innerHTML = '';
- head = head || '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ styles += dom.getOuterHTML( link ) + '\n';
+ }
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- styles += dom.getOuterHTML( link ) + '\n';
- }
- });
-
- wp.mce.views.sandboxStyles = styles;
- } else {
- styles = wp.mce.views.sandboxStyles;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.mce.views.sandboxStyles = styles;
+ } else {
+ styles = wp.mce.views.sandboxStyles;
+ }
</ins><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Seems Firefox needs a bit of time to insert/set the view nodes,
- // or the iframe will fail especially when switching Text => Visual.
- setTimeout( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.innerHTML = '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> iframe = dom.add( content, 'iframe', {
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint scripturl: true */
</span><span class="cx" style="display: block; padding: 0 10px"> src: tinymce.Env.ie ? 'javascript:""' : '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,9 +587,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.off( 'wp-body-class-change', classChange );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ callback && callback.apply( this, arguments );
</ins><span class="cx" style="display: block; padding: 0 10px"> }, 50 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- callback && callback.apply( this, arguments );
</del><span class="cx" style="display: block; padding: 0 10px"> }, rendered );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>