Several TinyMCE fixes and adjustments: Gecko spellchecker, Gallery options, single quote in image captions, see #8021
git-svn-id: http://svn.automattic.com/wordpress/trunk@9917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -392,13 +392,13 @@ h6 {
|
||||
|
||||
.wrap .updated,
|
||||
.wrap .error {
|
||||
margin: 5px 0 12px;
|
||||
margin: 5px 0;
|
||||
}
|
||||
|
||||
.wrap h2 {
|
||||
font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
|
||||
margin: 0;
|
||||
padding: 12px 15px 1px 0;
|
||||
padding: 12px 15px 2px 0;
|
||||
text-shadow: rgba(255,255,255,1) 0px 1px 0px;
|
||||
}
|
||||
|
||||
|
||||
@@ -134,6 +134,8 @@ function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
|
||||
$html = preg_replace( '/align[^\s\'"]+\s?/', '', $html );
|
||||
if ( empty($align) ) $align = 'none';
|
||||
|
||||
$alt = ! empty($alt) ? addslashes($alt) : '';
|
||||
|
||||
$shcode = '[caption id="' . $id . '" align="align' . $align
|
||||
. '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/caption]';
|
||||
|
||||
|
||||
@@ -140,10 +140,8 @@ var wpgallery = {
|
||||
if (t.el.nodeName != 'IMG') return;
|
||||
|
||||
all = ed.dom.decode(ed.dom.getAttrib(t.el, 'title'));
|
||||
all = all.substr(0, all.lastIndexOf(']'));
|
||||
all = all.replace(/\s*(order|link|columns|orderby)=['"]([^'"]+)['"]/gi, '');
|
||||
all += t.getSettings();
|
||||
all += ']';
|
||||
|
||||
ed.dom.setAttrib(t.el, 'title', all);
|
||||
t.getWin().tb_remove();
|
||||
|
||||
@@ -3115,7 +3115,7 @@ table.fixed {
|
||||
|
||||
.icon32 {
|
||||
float: left;
|
||||
height: 36px;
|
||||
margin: 8px 6px 0 0;
|
||||
height: 34px;
|
||||
margin: 7px 6px 0 0;
|
||||
width: 36px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user