WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Editor: Correctly indent definition lists when switching from the visual to the text editor. 

Props ocean90, katieburch.
Fixes #23299.
Built from https://develop.svn.wordpress.org/trunk@35999


git-svn-id: http://core.svn.wordpress.org/trunk@35964 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2015-12-17 23:06:25 +00:00
parent e8b900d9f5
commit a7e13d0af9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/js/editor.js
View File

@ -118,7 +118,7 @@
// Replace paragraphs with double line breaks // Replace paragraphs with double line breaks
function removep( html ) { function removep( html ) {
var blocklist = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset', var blocklist = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset',
blocklist1 = blocklist + '|div|p', blocklist1 = blocklist + '|div|p',
blocklist2 = blocklist + '|pre', blocklist2 = blocklist + '|pre',
preserve_linebreaks = false, preserve_linebreaks = false,
@ -170,7 +170,7 @@
html = html.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' ); html = html.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' );
html = html.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' ); html = html.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
html = html.replace( /<li([^>]*)>/g, '\t<li$1>' ); html = html.replace( /<((li|dt|dd)[^>]*)>/g, ' \t<$1>' );
if ( html.indexOf( '<option' ) !== -1 ) { if ( html.indexOf( '<option' ) !== -1 ) {
html = html.replace( /\s*<option/g, '\n<option' ); html = html.replace( /\s*<option/g, '\n<option' );

2
wp-admin/js/editor.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-35998'; $wp_version = '4.5-alpha-35999';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.