<!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>[38158] trunk/src/wp-includes/js: TinyMCE, wpView:</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/38158">38158</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/38158","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>2016-07-26 23:12:14 +0000 (Tue, 26 Jul 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, wpView:
- Add the `wpview-wrap` class and pass third param to the getNodes() callback for back-compat.
- Attach the mutation observer that resizes a view iframe inside the iframe to minimize memory use/leaks.
- Remove the `wp-mce-view-unbind` event. It has never been particularly reliable and now it doesn't fire when the user deletes a view by typing or pasting over it.
- Restore changing of a view iframe body classes when the editor body classes change.
Props iseulde, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/36434">#36434</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-07-26 22:05:39 UTC (rev 38157)
+++ trunk/src/wp-includes/js/mce-view.js 2016-07-26 23:12:14 UTC (rev 38158)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unbind: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.getNodes( function( editor, node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.unbindNode.call( this, editor, node );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( node ).trigger( 'wp-mce-view-unbind' );
</del><span class="cx" style="display: block; padding: 0 10px"> }, true );
</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">@@ -394,7 +393,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return rendered ? data : ! data;
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> .each( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- callback.call( self, editor, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ callback.call( self, editor, this, this /* back compat */ );
</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">@@ -429,7 +428,7 @@
</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"> $viewNode = editor.$(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<div class="wpview" data-wpview-text="' + this.encodedText + '" data-wpview-type="' + this.type + '" contenteditable="false"></div>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<div class="wpview wpview-wrap" data-wpview-text="' + this.encodedText + '" data-wpview-type="' + this.type + '" contenteditable="false"></div>'
</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"> editor.$( node ).replaceWith( $viewNode );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,8 +484,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"> setIframes: function( head, body, callback, rendered ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
- self = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.getNodes( function( editor, node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var dom = editor.dom,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Seems the browsers need a bit of time to insert/set the view nodes,
</span><span class="cx" style="display: block; padding: 0 10px"> // or the iframe will fail especially when switching Text => Visual.
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var iframe, iframeDoc, observer, i, block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var 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"> editor.undoManager.transact( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> node.innerHTML = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,8 +545,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- iframeDoc = iframe.contentWindow.document;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframeWin = iframe.contentWindow;
+ iframeDoc = iframeWin.document;
</ins><span class="cx" style="display: block; padding: 0 10px"> iframeDoc.open();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> iframeDoc.write(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,8 +610,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 3000 );
</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">- $( iframe.contentWindow ).on( 'load', resize );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( iframeWin ).on( 'load', resize );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ MutationObserver = iframeWin.MutationObserver || iframeWin.WebKitMutationObserver || iframeWin.MozMutationObserver;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( MutationObserver ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -622,26 +622,12 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $( node ).one( 'wp-mce-view-unbind', function() {
- observer.disconnect();
- } );
</del><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 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">- function classChange() {
- iframeDoc.body.className = editor.getBody().className;
- }
-
- editor.on( 'wp-body-class-change', classChange );
-
- $( node ).one( 'wp-mce-view-unbind', function() {
- editor.off( 'wp-body-class-change', classChange );
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> callback && callback.call( self, editor, node );
</span><span class="cx" style="display: block; padding: 0 10px"> }, 50 );
</span><span class="cx" style="display: block; padding: 0 10px"> }, rendered );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,7 +712,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> remove: function( editor, node ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.unbindNode.call( this, editor, node );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( node ).trigger( 'wp-mce-view-unbind' );
</del><span class="cx" style="display: block; padding: 0 10px"> editor.dom.remove( node );
</span><span class="cx" style="display: block; padding: 0 10px"> editor.focus();
</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-07-26 22:05:39 UTC (rev 38157)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2016-07-26 23:12:14 UTC (rev 38158)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .replace( /<p[^>]+data-wpview-marker="([^"]+)"[^>]*>[\s\S]*?<\/p>/g, callback );
</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">+ editor.on( 'init', function() {
+ var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+
+ if ( MutationObserver ) {
+ new MutationObserver( function() {
+ editor.fire( 'wp-body-class-change' );
+ } )
+ .observe( editor.getBody(), {
+ attributes: true,
+ attributeFilter: ['class']
+ } );
+ }
+
+ // Pass on body class name changes from the editor to the wpView iframes.
+ editor.on( 'wp-body-class-change', function() {
+ var className = editor.getBody().className;
+
+ editor.$( 'iframe[class="wpview-sandbox"]' ).each( function( i, iframe ) {
+ // Make sure it is a local iframe
+ // jshint scripturl: true
+ if ( ! iframe.src || iframe.src === 'javascript:""' ) {
+ try {
+ iframe.contentWindow.document.body.className = className;
+ } catch( er ) {}
+ }
+ });
+ } );
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Scan new content for matching view patterns and replace them with markers.
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'beforesetcontent', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var node;
</span></span></pre>
</div>
</div>
</body>
</html>