<!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>[33316] branches/4.2/src/wp-includes/js: TinyMCE wpView: preserve HTML wrapped in shortcodes.</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/33316">33316</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/33316","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-07-17 22:01:59 +0000 (Fri, 17 Jul 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: preserve HTML wrapped in shortcodes.
Props iseulde, azaozz. Fixes <a href="https://core.trac.wordpress.org/ticket/32078">#32078</a> for 4.2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches42srcwpincludesjsmceviewjs">branches/4.2/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#branches42srcwpincludesjsmediaviewsframevideodetailsjs">branches/4.2/src/wp-includes/js/media/views/frame/video-details.js</a></li>
<li><a href="#branches42srcwpincludesjsmediaaudiovideojs">branches/4.2/src/wp-includes/js/media-audiovideo.js</a></li>
<li><a href="#branches42srcwpincludesjstinymcepluginswpviewpluginjs">branches/4.2/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches42srcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/src/wp-includes/js/mce-view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.2/src/wp-includes/js/mce-view.js 2015-07-17 21:39:09 UTC (rev 33315)
+++ branches/4.2/src/wp-includes/js/mce-view.js 2015-07-17 22:01:59 UTC (rev 33316)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,8 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setMarkers: function( content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var pieces = [ { content: content } ],
</span><span class="cx" style="display: block; padding: 0 10px"> self = this,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- instance,
- current;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ instance, current;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( views, function( view, type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> current = pieces.slice();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( current, function( piece ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var remaining = piece.content,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- result;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ result, text;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ignore processed pieces, but retain their location.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( piece.processed ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,10 +118,11 @@
</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"> instance = self.createInstance( type, result.content, result.options );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ text = instance.loader ? '.' : instance.text;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the processed piece for the match.
</span><span class="cx" style="display: block; padding: 0 10px"> pieces.push( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content: '<p data-wpview-marker="' + instance.encodedText + '">' + instance.text + '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content: '<p data-wpview-marker="' + instance.encodedText + '">' + text + '</p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> processed: 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">@@ -138,7 +138,8 @@
</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">- return _.pluck( pieces, 'content' ).join( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content = _.pluck( pieces, 'content' ).join( '' );
+ return content.replace( /<p>\s*<p data-wpview-marker=/g, '<p data-wpview-marker=' ).replace( /<\/p>\s*<\/p>/g, '</p>' );
</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">@@ -417,7 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> replaceMarkers: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.getMarkers( function( editor, node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $( node ).text() !== this.text ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.loader && $( node ).text() !== this.text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.dom.setAttrib( node, 'data-wpview-marker', null );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches42srcwpincludesjsmediaviewsframevideodetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/src/wp-includes/js/media/views/frame/video-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.2/src/wp-includes/js/media/views/frame/video-details.js 2015-07-17 21:39:09 UTC (rev 33315)
+++ branches/4.2/src/wp-includes/js/media/views/frame/video-details.js 2015-07-17 22:01:59 UTC (rev 33316)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 === content.indexOf( attachment.get( 'url' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> content += [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<track srclang="en" label="English"kind="subtitles" src="',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<track srclang="en" label="English" kind="subtitles" src="',
</ins><span class="cx" style="display: block; padding: 0 10px"> attachment.get( 'url' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '" />'
</span><span class="cx" style="display: block; padding: 0 10px"> ].join('');
</span></span></pre></div>
<a id="branches42srcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/src/wp-includes/js/media-audiovideo.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.2/src/wp-includes/js/media-audiovideo.js 2015-07-17 21:39:09 UTC (rev 33315)
+++ branches/4.2/src/wp-includes/js/media-audiovideo.js 2015-07-17 22:01:59 UTC (rev 33316)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,7 +704,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 === content.indexOf( attachment.get( 'url' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> content += [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<track srclang="en" label="English"kind="subtitles" src="',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<track srclang="en" label="English" kind="subtitles" src="',
</ins><span class="cx" style="display: block; padding: 0 10px"> attachment.get( 'url' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '" />'
</span><span class="cx" style="display: block; padding: 0 10px"> ].join('');
</span></span></pre></div>
<a id="branches42srcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/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">--- branches/4.2/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2015-07-17 21:39:09 UTC (rev 33315)
+++ branches/4.2/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2015-07-17 22:01:59 UTC (rev 33316)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,19 +152,20 @@
</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">- // Remove the content of view wrappers from HTML string
- function emptyViews( content ) {
- content = content.replace( /<div[^>]+data-wpview-text="([^"]+)"[^>]*>[\s\S]+?wpview-selection-after[^>]+>[^<>]*<\/p>\s*<\/div>/g, function( all, match ) {
- return '<p>' + window.decodeURIComponent( match ) + '</p>';
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function resetViewsCallback( match, viewText ) {
+ return '<p>' + window.decodeURIComponent( viewText ) + '</p>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return content.replace( / data-wpview-marker="[^"]+"/g, '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Replace the view tags with the view string
+ function resetViews( content ) {
+ return content.replace( /<div[^>]+data-wpview-text="([^"]+)"[^>]*>(?:[\s\S]+?wpview-selection-after[^>]+>[^<>]*<\/p>\s*|\.)<\/div>/g, resetViewsCallback )
+ .replace( /<p [^>]*?data-wpview-marker="([^"]+)"[^>]*>[\s\S]*?<\/p>/g, resetViewsCallback );
</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"> // Prevent adding undo levels on changes inside a view wrapper
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'BeforeAddUndo', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.level.content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- event.level.content = emptyViews( event.level.content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ event.level.content = resetViews( event.level.content );
</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">@@ -348,33 +349,31 @@
</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 resetViews( rootNode ) {
- // Replace view nodes
- $( 'div[data-wpview-text]', rootNode ).each( function( i, node ) {
- var $node = $( node ),
- text = window.decodeURIComponent( $node.attr( 'data-wpview-text' ) || '' );
-
- if ( text && node.parentNode ) {
- $node.replaceWith( $( editor.dom.create('p') ).text( text ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Empty the wpview wrap and marker nodes
+ function emptyViewNodes( rootNode ) {
+ $( 'div[data-wpview-text], p[data-wpview-marker]', rootNode ).each( function( i, node ) {
+ 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">-
- // Remove marker attributes
- $( 'p[data-wpview-marker]', rootNode ).attr( 'data-wpview-marker', null );
</del><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">+ // Run that before the DOM cleanup
</ins><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'PreProcess', function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Replace the view nodes with their text in the DOM clone.
- resetViews( event.node );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emptyViewNodes( event.node );
</ins><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"> editor.on( 'hide', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Replace the view nodes with their text directly in the editor body.
</del><span class="cx" style="display: block; padding: 0 10px"> wp.mce.views.unbind();
</span><span class="cx" style="display: block; padding: 0 10px"> deselect();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- resetViews( editor.getBody() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emptyViewNodes();
</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">+ editor.on( 'PostProcess', function( event ) {
+ if ( event.content ) {
+ event.content = event.content.replace( /<div [^>]*?data-wpview-text="([^"]+)"[^>]*>[\s\S]*?<\/div>/g, resetViewsCallback )
+ .replace( /<p [^>]*?data-wpview-marker="([^"]+)"[^>]*>[\s\S]*?<\/p>/g, resetViewsCallback );
+ }
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Excludes arrow keys, delete, backspace, enter, space bar.
</span><span class="cx" style="display: block; padding: 0 10px"> // Ref: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.keyCode
</span><span class="cx" style="display: block; padding: 0 10px"> function isSpecialKey( key ) {
</span></span></pre>
</div>
</div>
</body>
</html>