<!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>[27729] trunk/src/wp-includes/js: TinyMCE: fix the More and Next Page tags behavior:</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27729">27729</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-26 02:07:23 +0000 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: fix the More and Next Page tags behavior:
- Append them inside top level <p> tags.
- If the caret is not in a top level <p>, create new paragraph after the current top level tag.
- Do not change placement when edited in the Text editor.
See <a href="http://core.trac.wordpress.org/ticket/27378">#27378</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsquicktagsjs">trunk/src/wp-includes/js/quicktags.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswordpresspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsquicktagsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/quicktags.js (27728 => 27729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/quicktags.js 2014-03-25 22:21:24 UTC (rev 27728)
+++ trunk/src/wp-includes/js/quicktags.js 2014-03-26 02:07:23 UTC (rev 27729)
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> edButtons[90] = new qt.TagButton('ol','ol','<ol>\n','</ol>\n\n','o'),
</span><span class="cx"> edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n','l'),
</span><span class="cx"> edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
</span><del>- edButtons[120] = new qt.TagButton('more','more','\n\n<!--more-->\n\n','','t'),
</del><ins>+ edButtons[120] = new qt.TagButton('more','more','<!--more-->\n\n','','t'),
</ins><span class="cx"> edButtons[140] = new qt.CloseButton();
</span><span class="cx">
</span><span class="cx"> })();
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswordpresspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (27728 => 27729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-25 22:21:24 UTC (rev 27728)
+++ trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js 2014-03-26 02:07:23 UTC (rev 27729)
</span><span class="lines">@@ -130,32 +130,10 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Make sure the "more" tag is in a separate paragraph
- editor.on( 'PreProcess', function( event ) {
- var more;
-
- if ( event.save ) {
- more = editor.dom.select( 'img.wp-more-tag', event.node );
-
- if ( more.length ) {
- tinymce.each( more, function( node ) {
- var parent = node.parentNode, p;
-
- if ( parent.nodeName === 'P' && parent.childNodes.length > 1 ) {
- p = editor.dom.create('p');
- parent.parentNode.insertBefore( p, parent );
- p.appendChild( node );
- }
- });
- }
- }
- });
-
</del><span class="cx"> // Register commands
</span><span class="cx"> editor.addCommand( 'WP_More', function( tag ) {
</span><del>- var parent, html, title, p1, p2,
</del><ins>+ var parent, html, title,
</ins><span class="cx"> classname = 'wp-more-tag',
</span><del>- spacer = tinymce.Env.ie ? '' : '<br data-mce-bogus="1" />',
</del><span class="cx"> dom = editor.dom,
</span><span class="cx"> node = editor.selection.getNode();
</span><span class="cx">
</span><span class="lines">@@ -165,8 +143,9 @@
</span><span class="cx"> html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" ' +
</span><span class="cx"> 'data-mce-resize="false" data-mce-placeholder="1" />';
</span><span class="cx">
</span><del>- if ( node.nodeName === 'BODY' ) {
- editor.insertContent( '<p>' + html + '</p><p></p>' );
</del><ins>+ // Most common case
+ if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) {
+ editor.insertContent( html );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,16 +159,13 @@
</span><span class="cx"> }, editor.getBody() );
</span><span class="cx">
</span><span class="cx"> if ( parent ) {
</span><del>- p1 = dom.create( 'p', null, html );
- dom.insertAfter( p1, parent );
-
- if ( ! ( p2 = p1.nextSibling ) ) {
- p2 = dom.create( 'p', null, spacer );
- dom.insertAfter( p2, p1 );
</del><ins>+ if ( parent.nodeName === 'P' ) {
+ parent.appendChild( dom.create( 'p', null, html ).firstChild );
+ } else {
+ dom.insertAfter( dom.create( 'p', null, html ), parent );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> editor.nodeChanged();
</span><del>- editor.selection.setCursorLocation( p2, 0 );
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>