TinyMCE: revert 158b742410 and 576fa77aa2 as they may cause selection restore problems in old IE. See #28391.

git-svn-id: https://develop.svn.wordpress.org/trunk@28795 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-06-21 01:14:43 +00:00
parent c45a47efdd
commit 31da18f841
3 changed files with 8 additions and 40 deletions

View File

@ -17598,44 +17598,12 @@ define("tinymce/UndoManager", [
editor.addShortcut('ctrl+z', '', 'Undo');
editor.addShortcut('ctrl+y,ctrl+shift+z', '', 'Redo');
editor.on('AddUndo Undo Redo ClearUndos', function(e) {
editor.on('AddUndo Undo Redo ClearUndos MouseUp', function(e) {
if (!e.isDefaultPrevented()) {
editor.nodeChanged();
}
});
// Selection range isn't updated until after the click events default handler is executed
// so we need to wait for the selection to update on Gecko/WebKit it happens right away.
// On IE it might take a while so we listen for the SelectionChange event.
//
// We can't use the SelectionChange on all browsers event since Gecko doesn't support that.
if (Env.ie) {
editor.on('MouseUp', function(e) {
if (!e.isDefaultPrevented()) {
editor.once('SelectionChange', function() {
// Selection change might fire when focus is lost
if (editor.dom.isChildOf(editor.selection.getStart(), editor.getBody())) {
editor.nodeChanged();
}
});
editor.nodeChanged();
}
});
} else {
editor.on('MouseUp', function() {
editor.nodeChanged();
});
editor.on('Click', function(e) {
if (!e.isDefaultPrevented()) {
setTimeout(function() {
editor.nodeChanged();
}, 0);
}
});
}
self = {
// Explose for debugging reasons
data: data,

File diff suppressed because one or more lines are too long

View File

@ -18,7 +18,7 @@ $wp_db_version = 27916;
*
* @global string $tinymce_version
*/
$tinymce_version = '4028-20140617';
$tinymce_version = '4028-20140620';
/**
* Holds the required PHP version