TinyMCE: fix styling in the Charmap modal so the click targets are as large as the table cells. Remove the "Close" button and close the modal after inserting the special char. Fixes #27107.

Built from https://develop.svn.wordpress.org/trunk@27165


git-svn-id: http://core.svn.wordpress.org/trunk@27031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-02-11 23:33:14 +00:00
parent 5d0f6bd98a
commit 20fe8f026e
8 changed files with 31 additions and 6 deletions

View File

@ -100,6 +100,17 @@ div.mce-statusbar {
margin-right: -16px;
}
/* Charmap modal */
.mce-charmap td {
padding: 0;
}
.mce-charmap td div {
width: 18px;
height: 22px;
line-height: 22px;
}
/* Icons */
.mce-toolbar .mce-ico {
color: #777;

File diff suppressed because one or more lines are too long

View File

@ -100,6 +100,17 @@ div.mce-statusbar {
margin-left: -16px;
}
/* Charmap modal */
.mce-charmap td {
padding: 0;
}
.mce-charmap td div {
width: 18px;
height: 22px;
line-height: 22px;
}
/* Icons */
.mce-toolbar .mce-ico {
color: #777;

File diff suppressed because one or more lines are too long

View File

@ -312,6 +312,8 @@ tinymce.PluginManager.add('charmap', function(editor) {
var target = e.target;
if (target.nodeName == 'DIV') {
editor.execCommand('mceInsertContent', false, target.firstChild.nodeValue);
// WP, see #27107
win.close();
}
},
onmouseover: function(e) {
@ -340,9 +342,10 @@ tinymce.PluginManager.add('charmap', function(editor) {
}
],
buttons: [
/* WP, see #27107
{text: "Close", onclick: function() {
win.close();
}}
}} */
]
});
}
@ -359,4 +362,4 @@ tinymce.PluginManager.add('charmap', function(editor) {
onclick: showDialog,
context: 'insert'
});
});
});

File diff suppressed because one or more lines are too long

View File

@ -18,7 +18,7 @@ $wp_db_version = 26691;
*
* @global string $tinymce_version
*/
$tinymce_version = '4016-20140210';
$tinymce_version = '4016-20140211';
/**
* Holds the required PHP version