<!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>[29315] trunk/src: Formatting: no <p> or <br> around <option> tags in both flavours of wpautop, make "selects" easier to read in the Text editor.</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/29315">29315</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-28 19:43:06 +0000 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Formatting: no <p> or <br> around <option> tags in both flavours of wpautop, make "selects" easier to read in the Text editor. Fixes <a href="http://core.trac.wordpress.org/ticket/28217">#28217</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditorjs">trunk/src/wp-admin/js/editor.js</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/editor.js (29314 => 29315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor.js 2014-07-28 15:51:02 UTC (rev 29314)
+++ trunk/src/wp-admin/js/editor.js 2014-07-28 19:43:06 UTC (rev 29315)
</span><span class="lines">@@ -168,6 +168,11 @@
</span><span class="cx"> content = content.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
</span><span class="cx"> content = content.replace( /<li([^>]*)>/g, '\t<li$1>' );
</span><span class="cx">
</span><ins>+ if ( content.indexOf( '<option' ) !== -1 ) {
+ content = content.replace( /\s*<option/g, '\n<option' );
+ content = content.replace( /\s*<\/select>/g, '\n</select>' );
+ }
+
</ins><span class="cx"> if ( content.indexOf( '<hr' ) !== -1 ) {
</span><span class="cx"> content = content.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
</span><span class="cx"> }
</span><span class="lines">@@ -244,6 +249,8 @@
</span><span class="cx"> pee = pee.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' );
</span><span class="cx"> pee = pee.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
</span><span class="cx"> pee = pee.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
</span><ins>+ pee = pee.replace( /\s<option/gi, '<option' ); // No <p> or <br> around <option>
+ pee = pee.replace( /<\/option>\s/gi, '</option>' );
</ins><span class="cx"> pee = pee.replace( /\r\n|\r/g, '\n' );
</span><span class="cx"> pee = pee.replace( /\n\s*\n+/g, '\n\n' );
</span><span class="cx"> pee = pee.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (29314 => 29315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-07-28 15:51:02 UTC (rev 29314)
+++ trunk/src/wp-includes/formatting.php 2014-07-28 19:43:06 UTC (rev 29315)
</span><span class="lines">@@ -392,6 +392,12 @@
</span><span class="cx"> $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
</span><span class="cx"> $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
</span><span class="cx">
</span><ins>+ if ( strpos( $pee, '<option' ) !== false ) {
+ // no P/BR around option
+ $pee = preg_replace( '|\s<option|', '<option', $pee );
+ $pee = preg_replace( '|</option>\s|', '</option>', $pee );
+ }
+
</ins><span class="cx"> if ( strpos( $pee, '</object>' ) !== false ) {
</span><span class="cx"> // no P/BR around param and embed
</span><span class="cx"> $pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
</span></span></pre>
</div>
</div>
</body>
</html>