<!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>[32255] trunk/src/wp-includes/js/mce-view.js: TinyMCE wpView: ensure `contentNode` is passed to all callbacks.</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/32255">32255</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/32255","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-04-21 18:35:50 +0000 (Tue, 21 Apr 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 wpView: ensure `contentNode` is passed to all callbacks.
Props iseulde. Fixes <a href="https://core.trac.wordpress.org/ticket/31669">#31669</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-04-21 16:11:02 UTC (rev 32254)
+++ trunk/src/wp-includes/js/mce-view.js 2015-04-21 18:35:50 UTC (rev 32255)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,9 +322,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.replaceMarkers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setContent( content, function( editor, node ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setContent( content, function( editor, node, contentNode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( node ).data( 'rendered', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.bindNode.call( this, editor, node );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.bindNode.call( this, editor, node, contentNode );
</ins><span class="cx" style="display: block; padding: 0 10px"> }, force ? null : false );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.setLoader();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,8 +346,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Runs before their content is removed from the DOM.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> unbind: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.getNodes( function( editor, node ) {
- this.unbindNode.call( this, editor, node );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.getNodes( function( editor, node, contentNode ) {
+ this.unbindNode.call( this, editor, node, contentNode );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( node ).trigger( 'wp-mce-view-unbind' );
</span><span class="cx" style="display: block; padding: 0 10px"> }, true );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
</span><span class="cx" style="display: block; padding: 0 10px"> self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.getNodes( function( editor, node, content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.getNodes( function( editor, node, contentNode ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,9 +504,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var iframe, iframeDoc, observer, i;
</span><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 = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ contentNode.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">- iframe = dom.add( content, 'iframe', {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ iframe = dom.add( contentNode, 'iframe', {
</ins><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="cx" style="display: block; padding: 0 10px"> frameBorder: '0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +519,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- dom.add( content, 'div', { 'class': 'wpview-overlay' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dom.add( contentNode, 'div', { 'class': 'wpview-overlay' } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> iframeDoc = iframe.contentWindow.document;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,7 +603,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- callback && callback.call( self, editor, node );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ callback && callback.call( self, editor, node, contentNode );
</ins><span class="cx" style="display: block; padding: 0 10px"> }, 50 );
</span><span class="cx" style="display: block; padding: 0 10px"> }, rendered );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre>
</div>
</div>
</body>
</html>