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

Fix regression: the visual editor removes empty paragraphs, fix CSS for the spellchecker button, fixes #17368 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-05-27 19:27:19 +00:00
parent fce00c287b
commit 41a001a682
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
View File

@ -210,6 +210,11 @@
}); });
}; };
// keep empty paragraphs :(
ed.onSaveContent.addToTop(function(ed, o) {
o.content = o.content.replace(/<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p>&nbsp;</p>');
});
ed.onSaveContent.add(function(ed, o) { ed.onSaveContent.add(function(ed, o) {
if ( typeof(switchEditors) == 'object' ) { if ( typeof(switchEditors) == 'object' ) {
if ( ed.isHidden() ) if ( ed.isHidden() )

2
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

9
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css
View File

@ -65,17 +65,18 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
.wp_themeSkin span.mce_unlink, .wp_themeSkin span.mce_unlink,
.wp_themeSkin span.mce_help, .wp_themeSkin span.mce_help,
.wp_themeSkin span.mce_removeformat, .wp_themeSkin span.mce_removeformat,
.wp_themeSkin span.mce_forecolor,
.wp_themeSkin .mce_forecolorpicker,
.wp_themeSkin span.mce_fullscreen, .wp_themeSkin span.mce_fullscreen,
.wp_themeSkin span.mce_media, .wp_themeSkin span.mce_media,
.wp_themeSkin span.mce_pastetext, .wp_themeSkin span.mce_pastetext,
.wp_themeSkin span.mce_pasteword, .wp_themeSkin span.mce_pasteword,
.wp_themeSkin span.mce_spellchecker,
.wp_themeSkin span.mce_wp_help, .wp_themeSkin span.mce_wp_help,
.wp_themeSkin span.mce_wp_adv, .wp_themeSkin span.mce_wp_adv,
.wp_themeSkin span.mce_wp_more, .wp_themeSkin span.mce_wp_more,
.wp_themeSkin span.mce_strikethrough, .wp_themeSkin span.mce_strikethrough,
.wp_themeSkin span.mce_spellchecker,
.wp_themeSkin span.mce_forecolor,
.wp_themeSkin .mce_forecolorpicker,
.wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker,
.wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor { .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor {
background: url(../../img/wpicons.png) no-repeat 20px 20px; background: url(../../img/wpicons.png) no-repeat 20px 20px;
} }
@ -274,7 +275,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we
.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px;} .wp_themeSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px;}
.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {} .wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {}
.wp_themeSkin a.mceMoreColors:hover {} .wp_themeSkin a.mceMoreColors:hover {}
.wp_themeSkin .mceColorPreview {margin: -4px 0 0 2px; width:16px; height:4px; overflow:hidden} .wp_themeSkin .mceColorPreview {margin: -5px 0 0 2px; width:16px; height:4px; overflow:hidden}
/* Menu */ /* Menu */
.wp_themeSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000;} .wp_themeSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000;}

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -36,7 +36,7 @@ $wp_db_version = 17517;
* *
* @global string $tinymce_version * @global string $tinymce_version
*/ */
$tinymce_version = '342-20110518'; $tinymce_version = '342-20110527';
/** /**
* Holds the cache manifest version * Holds the cache manifest version