<!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>[39282] trunk/src/wp-includes/js: TinyMCE views: fix Firefox issues.</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/39282">39282</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/39282","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-17 20:31:12 +0000 (Thu, 17 Nov 2016)</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 views: fix Firefox issues.
* Set focus before rendering to prevent reload in Firefox.
* Rerender views if they are unloaded.
* Remove timeout added in <a href="https://core.trac.wordpress.org/changeset/29513">[29513]</a>.
* Fix argument in wp.mce.views.render.
* Empty views on hide. Missed in <a href="https://core.trac.wordpress.org/ticket/36434">#36434</a>.
Props gitlost, azaozz, iseulde.
Fixes <a href="https://core.trac.wordpress.org/ticket/38511">#38511</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.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 2016-11-17 18:27:16 UTC (rev 39281)
+++ trunk/src/wp-includes/js/mce-view.js 2016-11-17 20:31:12 UTC (rev 39282)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,6 +157,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> text = tinymce.DOM.decode( text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( text.indexOf( '[' ) !== -1 && text.indexOf( ']' ) !== -1 ) {
+ // Looks like a shortcode? Remove any line breaks from inside of shortcodes
+ // or autop will replace them with <p> and <br> later and the string won't match.
+ text = text.replace( /\[[^\]]+\]/g, function( match ) {
+ return match.replace( /[\r\n]/g, '' );
+ });
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! force ) {
</span><span class="cx" style="display: block; padding: 0 10px"> instance = this.getInstance( text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> render: function( force ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( instances, function( instance ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- instance.render( force );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ instance.render( null, force );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +498,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var dom = editor.dom,
</span><span class="cx" style="display: block; padding: 0 10px"> styles = '',
</span><span class="cx" style="display: block; padding: 0 10px"> bodyClasses = editor.getBody().className || '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editorHead = editor.getDoc().getElementsByTagName( 'head' )[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editorHead = editor.getDoc().getElementsByTagName( 'head' )[0],
+ iframe, iframeWin, iframeDoc, MutationObserver, observer, i, block;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce.each( dom.$( 'link[rel="stylesheet"]', editorHead ), function( link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( link.href && link.href.indexOf( 'skins/lightgray/content.min.css' ) === -1 &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,125 +520,127 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, '\u200B' );
</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">- // Seems the browsers need a bit of time to insert/set the view nodes,
- // or the iframe will fail especially when switching Text => Visual.
- setTimeout( function() {
- var iframe, iframeWin, iframeDoc, MutationObserver, observer, i, block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.undoManager.transact( function() {
+ node.innerHTML = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.undoManager.transact( function() {
- node.innerHTML = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframe = dom.add( node, 'iframe', {
+ /* jshint scripturl: true */
+ src: tinymce.Env.ie ? 'javascript:""' : '',
+ frameBorder: '0',
+ allowTransparency: 'true',
+ scrolling: 'no',
+ 'class': 'wpview-sandbox',
+ style: {
+ width: '100%',
+ display: 'block'
+ },
+ height: self.iframeHeight
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframe = dom.add( node, 'iframe', {
- /* jshint scripturl: true */
- src: tinymce.Env.ie ? 'javascript:""' : '',
- frameBorder: '0',
- allowTransparency: 'true',
- scrolling: 'no',
- 'class': 'wpview-sandbox',
- style: {
- width: '100%',
- display: 'block'
- },
- height: self.iframeHeight
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dom.add( node, 'span', { 'class': 'mce-shim' } );
+ dom.add( node, 'span', { 'class': 'wpview-end' } );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dom.add( node, 'span', { 'class': 'mce-shim' } );
- dom.add( node, 'span', { 'class': 'wpview-end' } );
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if the iframe node is not attached to the DOM.
+ // Happens when the view is dragged in the editor.
+ // There is a browser restriction when iframes are moved in the DOM. They get emptied.
+ // The iframe will be rerendered after dropping the view node at the new location.
+ if ( ! iframe.contentWindow ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if the iframe node is not attached to the DOM.
- // Happens when the view is dragged in the editor.
- // There is a browser restriction when iframes are moved in the DOM. They get emptied.
- // The iframe will be rerendered after dropping the view node at the new location.
- if ( ! iframe.contentWindow ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframeWin = iframe.contentWindow;
+ iframeDoc = iframeWin.document;
+ iframeDoc.open();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframeWin = iframe.contentWindow;
- iframeDoc = iframeWin.document;
- iframeDoc.open();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframeDoc.write(
+ '<!DOCTYPE html>' +
+ '<html>' +
+ '<head>' +
+ '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
+ head +
+ styles +
+ '<style>' +
+ 'html {' +
+ 'background: transparent;' +
+ 'padding: 0;' +
+ 'margin: 0;' +
+ '}' +
+ 'body#wpview-iframe-sandbox {' +
+ 'background: transparent;' +
+ 'padding: 1px 0 !important;' +
+ 'margin: -1px 0 0 !important;' +
+ '}' +
+ 'body#wpview-iframe-sandbox:before,' +
+ 'body#wpview-iframe-sandbox:after {' +
+ 'display: none;' +
+ 'content: "";' +
+ '}' +
+ '</style>' +
+ '</head>' +
+ '<body id="wpview-iframe-sandbox" class="' + bodyClasses + '">' +
+ body +
+ '</body>' +
+ '</html>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframeDoc.write(
- '<!DOCTYPE html>' +
- '<html>' +
- '<head>' +
- '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
- head +
- styles +
- '<style>' +
- 'html {' +
- 'background: transparent;' +
- 'padding: 0;' +
- 'margin: 0;' +
- '}' +
- 'body#wpview-iframe-sandbox {' +
- 'background: transparent;' +
- 'padding: 1px 0 !important;' +
- 'margin: -1px 0 0 !important;' +
- '}' +
- 'body#wpview-iframe-sandbox:before,' +
- 'body#wpview-iframe-sandbox:after {' +
- 'display: none;' +
- 'content: "";' +
- '}' +
- '</style>' +
- '</head>' +
- '<body id="wpview-iframe-sandbox" class="' + bodyClasses + '">' +
- body +
- '</body>' +
- '</html>'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframeDoc.close();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframeDoc.close();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function resize() {
+ var $iframe;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function resize() {
- var $iframe;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( block ) {
+ return;
+ }
</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 ( block ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure the iframe still exists.
+ if ( iframe.contentWindow ) {
+ $iframe = $( iframe );
+ self.iframeHeight = $( iframeDoc.body ).height();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure the iframe still exists.
- if ( iframe.contentWindow ) {
- $iframe = $( iframe );
- self.iframeHeight = $( iframeDoc.body ).height();
-
- if ( $iframe.height() !== self.iframeHeight ) {
- $iframe.height( self.iframeHeight );
- editor.nodeChanged();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $iframe.height() !== self.iframeHeight ) {
+ $iframe.height( self.iframeHeight );
+ editor.nodeChanged();
</ins><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">+ }
</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 ( self.iframeHeight ) {
- block = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( self.iframeHeight ) {
+ block = true;
</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() {
- block = false;
- resize();
- }, 3000 );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( function() {
+ block = false;
+ resize();
+ }, 3000 );
+ }
</ins><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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function reload() {
+ $( 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">- MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( MutationObserver ) {
- observer = new MutationObserver( _.debounce( resize, 100 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( iframeWin ).on( 'load', resize ).on( 'unload', reload );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- observer.observe( iframeDoc.body, {
- attributes: true,
- childList: true,
- subtree: true
- } );
- } else {
- for ( i = 1; i < 6; i++ ) {
- setTimeout( resize, i * 700 );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
+
+ if ( MutationObserver ) {
+ observer = new MutationObserver( _.debounce( resize, 100 ) );
+
+ observer.observe( iframeDoc.body, {
+ attributes: true,
+ childList: true,
+ subtree: true
+ } );
+ } else {
+ for ( i = 1; i < 6; i++ ) {
+ setTimeout( resize, i * 700 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- callback && callback.call( self, editor, node );
- }, 50 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ callback && callback.call( self, editor, node );
</ins><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>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></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/tinymce/plugins/wpview/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2016-11-17 18:27:16 UTC (rev 39281)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2016-11-17 20:31:12 UTC (rev 39282)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,11 +93,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace any new markers nodes with views.
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'setcontent', function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure that the editor is focussed.
+ // May refresh the content internally which resets the iframes.
+ editor.focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.mce.views.render();
</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"> // Empty view nodes for easier processing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editor.on( 'preprocess', function( event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'preprocess hide', function( event ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.$( 'div[data-wpview-text], p[data-wpview-marker]', event.node ).each( function( i, node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> node.innerHTML = '.';
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span></span></pre>
</div>
</div>
</body>
</html>