Changeset 29315

Timestamp:

07/28/2014 07:43:06 PM (12 years ago)

Author:

azaozz

Message:

Formatting: no <p> or <br> around <option> tags in both flavours of wpautop, make "selects" easier to read in the Text editor. Fixes #28217.

Location:

trunk/src

Files:

• wp-admin/js/editor.js (modified) (2 diffs)
• wp-includes/formatting.php (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -168 +168 @@
         content = content.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
         content = content.replace( /<li([^>]*)>/g, '\t<li$1>' );
+
+        if ( content.indexOf( '<option' ) !== -1 ) {
+            content = content.replace( /\s*<option/g, '\n<option' );
+            content = content.replace( /\s*<\/select>/g, '\n</select>' );
+        }
 
         if ( content.indexOf( '<hr' ) !== -1 ) {
@@ -245 +250 @@
         pee = pee.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
         pee = pee.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
+        pee = pee.replace( /\s<option/gi, '<option' ); // No <p> or <br> around <option>
+        pee = pee.replace( /<\/option>\s/gi, '</option>' );
         pee = pee.replace( /\r\n|\r/g, '\n' );
         pee = pee.replace( /\n\s*\n+/g, '\n\n' );

trunk/src/wp-includes/formatting.php

@@ -392 +392 @@
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
     $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
+
+    if ( strpos( $pee, '<option' ) !== false ) {
+        // no P/BR around option
+        $pee = preg_replace( '|\s<option|', '<option', $pee );
+        $pee = preg_replace( '|</option>\s|', '</option>', $pee );
+    }
 
     if ( strpos( $pee, '</object>' ) !== false ) {