TinyMCE: update to 4.0.16, see #24067.
git-svn-id: https://develop.svn.wordpress.org/trunk@27062 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
ec20c47e12
commit
01da73ac78
|
@ -295,10 +295,17 @@ define("tinymce/pasteplugin/Clipboard", [
|
||||||
*/
|
*/
|
||||||
function createPasteBin() {
|
function createPasteBin() {
|
||||||
var dom = editor.dom, body = editor.getBody();
|
var dom = editor.dom, body = editor.getBody();
|
||||||
var viewport = editor.dom.getViewPort(editor.getWin()), scrollTop, top = 20;
|
var viewport = editor.dom.getViewPort(editor.getWin()), scrollTop = viewport.y, top = 20;
|
||||||
|
|
||||||
lastRng = editor.selection.getRng();
|
lastRng = editor.selection.getRng();
|
||||||
scrollTop = editor.inline ? editor.selection.getScrollContainer().scrollTop : viewport.y;
|
|
||||||
|
if (editor.inline) {
|
||||||
|
var scrollContainer = editor.selection.getScrollContainer();
|
||||||
|
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollTop = scrollContainer.scrollTop;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Calculate top cordinate this is needed to avoid scrolling to top of document
|
// Calculate top cordinate this is needed to avoid scrolling to top of document
|
||||||
// We want the paste bin to be as close to the caret as possible to avoid scrolling
|
// We want the paste bin to be as close to the caret as possible to avoid scrolling
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
||||||
// 4.0.14 (2014-01-30)
|
// 4.0.16 (2014-01-31)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compiled inline version. (Library mode)
|
* Compiled inline version. (Library mode)
|
||||||
|
@ -253,7 +253,7 @@ define("tinymce/dom/EventUtils", [], function() {
|
||||||
|
|
||||||
// Use W3C method
|
// Use W3C method
|
||||||
if (doc.addEventListener) {
|
if (doc.addEventListener) {
|
||||||
if (doc.readyState === "complete" || doc.readyState === "interactive") {
|
if (doc.readyState === "complete") {
|
||||||
readyHandler();
|
readyHandler();
|
||||||
} else {
|
} else {
|
||||||
addEvent(win, 'DOMContentLoaded', readyHandler);
|
addEvent(win, 'DOMContentLoaded', readyHandler);
|
||||||
|
@ -28254,7 +28254,7 @@ define("tinymce/EditorManager", [
|
||||||
* @property minorVersion
|
* @property minorVersion
|
||||||
* @type String
|
* @type String
|
||||||
*/
|
*/
|
||||||
minorVersion : '0.14',
|
minorVersion : '0.16',
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Release date of TinyMCE build.
|
* Release date of TinyMCE build.
|
||||||
|
@ -28262,7 +28262,7 @@ define("tinymce/EditorManager", [
|
||||||
* @property releaseDate
|
* @property releaseDate
|
||||||
* @type String
|
* @type String
|
||||||
*/
|
*/
|
||||||
releaseDate: '2014-01-30',
|
releaseDate: '2014-01-31',
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Collection of editor instances.
|
* Collection of editor instances.
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -18,7 +18,7 @@ $wp_db_version = 26691;
|
||||||
*
|
*
|
||||||
* @global string $tinymce_version
|
* @global string $tinymce_version
|
||||||
*/
|
*/
|
||||||
$tinymce_version = '4014-20140130';
|
$tinymce_version = '4016-20140131';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the required PHP version
|
* Holds the required PHP version
|
||||||
|
|
Loading…
Reference in New Issue