mirror of
https://github.com/WordPress/WordPress.git
synced 2024-06-23 21:34:57 +02:00
TinyMCE: update to 4.6.7, changelog: https://www.tinymce.com/docs/changelog/#version467september182017.
Fixes #41996 #40956 Built from https://develop.svn.wordpress.org/trunk@41604 git-svn-id: http://core.svn.wordpress.org/trunk@41439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz
parent
cb8173e053
commit
b32256701a
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
|
@ -286,22 +286,26 @@ define(
|
|||
function (Tools, Settings, RegExp) {
|
||||
|
||||
var toggleTargetRules = function (rel, isUnsafe) {
|
||||
var rules = 'noopener';
|
||||
var rules = ['noopener'];
|
||||
var newRel = rel ? rel.split(/\s+/) : [];
|
||||
|
||||
var toString = function (rel) {
|
||||
return Tools.trim(rel.sort().join(' '));
|
||||
};
|
||||
|
||||
var addTargetRules = function (rel) {
|
||||
rel = removeTargetRules(rel);
|
||||
return rel ? [rel, rules].join(' ') : rules;
|
||||
return rel.length ? rel.concat(rules) : rules;
|
||||
};
|
||||
|
||||
var removeTargetRules = function (rel) {
|
||||
var regExp = new RegExp('(' + rules.replace(' ', '|') + ')', 'g');
|
||||
if (rel) {
|
||||
rel = Tools.trim(rel.replace(regExp, ''));
|
||||
}
|
||||
return rel ? rel : null;
|
||||
return rel.filter(function (val) {
|
||||
return Tools.inArray(rules, val) === -1;
|
||||
});
|
||||
};
|
||||
|
||||
return isUnsafe ? addTargetRules(rel) : removeTargetRules(rel);
|
||||
newRel = isUnsafe ? addTargetRules(newRel) : removeTargetRules(newRel);
|
||||
return newRel.length ? toString(newRel) : null;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -365,7 +369,7 @@ define(
|
|||
title: data.title ? data.title : null
|
||||
};
|
||||
|
||||
if (Settings.allowUnsafeLinkTarget(editor.settings) === false) {
|
||||
if (!Settings.hasRelList(editor.settings) && Settings.allowUnsafeLinkTarget(editor.settings) === false) {
|
||||
linkAttrs.rel = toggleTargetRules(linkAttrs.rel, linkAttrs.target == '_blank');
|
||||
}
|
||||
|
||||
|
|
@ -447,7 +451,8 @@ define(
|
|||
hasLinks: hasLinks,
|
||||
isOnlyTextSelected: isOnlyTextSelected,
|
||||
getAnchorElement: getAnchorElement,
|
||||
getAnchorText: getAnchorText
|
||||
getAnchorText: getAnchorText,
|
||||
toggleTargetRules: toggleTargetRules
|
||||
};
|
||||
}
|
||||
);
|
||||
|
|
@ -691,7 +696,14 @@ define(
|
|||
name: 'rel',
|
||||
type: 'listbox',
|
||||
label: 'Rel',
|
||||
values: buildListItems(Settings.getRelList(editor.settings))
|
||||
values: buildListItems(
|
||||
Settings.getRelList(editor.settings),
|
||||
function (item) {
|
||||
if (Settings.allowUnsafeLinkTarget(editor.settings) === false) {
|
||||
item.value = Utils.toggleTargetRules(item.value, data.target === '_blank');
|
||||
}
|
||||
}
|
||||
)
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -81,7 +81,7 @@ var defineGlobal = function (id, ref) {
|
|||
define(id, [], function () { return ref; });
|
||||
};
|
||||
/*jsc
|
||||
["tinymce.plugins.lists.Plugin","tinymce.core.PluginManager","tinymce.core.util.Tools","tinymce.core.util.VK","tinymce.plugins.lists.actions.Indent","tinymce.plugins.lists.actions.Outdent","tinymce.plugins.lists.actions.ToggleList","tinymce.plugins.lists.core.Delete","tinymce.plugins.lists.core.NodeType","global!tinymce.util.Tools.resolve","tinymce.core.dom.DOMUtils","tinymce.plugins.lists.core.Bookmark","tinymce.plugins.lists.core.Selection","tinymce.plugins.lists.core.NormalizeLists","tinymce.plugins.lists.core.SplitList","tinymce.plugins.lists.core.TextBlock","tinymce.core.dom.BookmarkManager","tinymce.core.dom.RangeUtils","tinymce.core.dom.TreeWalker","tinymce.plugins.lists.core.Range","tinymce.core.Env"]
|
||||
["tinymce.plugins.lists.Plugin","tinymce.core.PluginManager","tinymce.core.util.Tools","tinymce.core.util.VK","tinymce.plugins.lists.actions.Indent","tinymce.plugins.lists.actions.Outdent","tinymce.plugins.lists.actions.ToggleList","tinymce.plugins.lists.core.Delete","tinymce.plugins.lists.core.NodeType","tinymce.plugins.lists.core.Selection","global!tinymce.util.Tools.resolve","tinymce.core.dom.DOMUtils","tinymce.plugins.lists.core.Bookmark","tinymce.core.dom.DomQuery","tinymce.plugins.lists.core.NormalizeLists","tinymce.plugins.lists.core.SplitList","tinymce.plugins.lists.core.TextBlock","tinymce.core.dom.BookmarkManager","tinymce.core.dom.RangeUtils","tinymce.core.dom.TreeWalker","tinymce.plugins.lists.core.Range","tinymce.core.Env"]
|
||||
jsc*/
|
||||
defineGlobal("global!tinymce.util.Tools.resolve", tinymce.util.Tools.resolve);
|
||||
/**
|
||||
|
|
@ -207,6 +207,10 @@ define(
|
|||
return node && !!editor.schema.getTextBlockElements()[node.nodeName];
|
||||
};
|
||||
|
||||
var isBlock = function (node, blockElements) {
|
||||
return node && node.nodeName in blockElements;
|
||||
};
|
||||
|
||||
var isBogusBr = function (dom, node) {
|
||||
if (!isBr(node)) {
|
||||
return false;
|
||||
|
|
@ -241,6 +245,7 @@ define(
|
|||
isFirstChild: isFirstChild,
|
||||
isLastChild: isLastChild,
|
||||
isTextBlock: isTextBlock,
|
||||
isBlock: isBlock,
|
||||
isBogusBr: isBogusBr,
|
||||
isEmpty: isEmpty,
|
||||
isChildOfBody: isChildOfBody
|
||||
|
|
@ -451,6 +456,26 @@ define(
|
|||
);
|
||||
|
||||
|
||||
/**
|
||||
* ResolveGlobal.js
|
||||
*
|
||||
* Released under LGPL License.
|
||||
* Copyright (c) 1999-2017 Ephox Corp. All rights reserved
|
||||
*
|
||||
* License: http://www.tinymce.com/license
|
||||
* Contributing: http://www.tinymce.com/contributing
|
||||
*/
|
||||
|
||||
define(
|
||||
'tinymce.core.dom.DomQuery',
|
||||
[
|
||||
'global!tinymce.util.Tools.resolve'
|
||||
],
|
||||
function (resolve) {
|
||||
return resolve('tinymce.dom.DomQuery');
|
||||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* Selection.js
|
||||
*
|
||||
|
|
@ -464,17 +489,42 @@ define(
|
|||
define(
|
||||
'tinymce.plugins.lists.core.Selection',
|
||||
[
|
||||
'tinymce.core.dom.DomQuery',
|
||||
'tinymce.core.util.Tools',
|
||||
'tinymce.plugins.lists.core.NodeType'
|
||||
],
|
||||
function (Tools, NodeType) {
|
||||
function (DomQuery, Tools, NodeType) {
|
||||
var getParentList = function (editor) {
|
||||
return editor.dom.getParent(editor.selection.getStart(true), 'OL,UL,DL');
|
||||
};
|
||||
|
||||
var getSelectedSubLists = function (editor) {
|
||||
var parentList = getParentList(editor);
|
||||
return Tools.grep(editor.selection.getSelectedBlocks(), function (elm) {
|
||||
return NodeType.isListNode(elm) && parentList !== elm;
|
||||
});
|
||||
};
|
||||
|
||||
var findParentListItemsNodes = function (editor, elms) {
|
||||
var listItemsElms = Tools.map(elms, function (elm) {
|
||||
var parentLi = editor.dom.getParent(elm, 'li,dd,dt', editor.getBody());
|
||||
|
||||
return parentLi ? parentLi : elm;
|
||||
});
|
||||
|
||||
return DomQuery.unique(listItemsElms);
|
||||
};
|
||||
|
||||
var getSelectedListItems = function (editor) {
|
||||
return Tools.grep(editor.selection.getSelectedBlocks(), function (block) {
|
||||
var selectedBlocks = editor.selection.getSelectedBlocks();
|
||||
return Tools.grep(findParentListItemsNodes(editor, selectedBlocks), function (block) {
|
||||
return NodeType.isListItemNode(block);
|
||||
});
|
||||
};
|
||||
|
||||
return {
|
||||
getParentList: getParentList,
|
||||
getSelectedSubLists: getSelectedSubLists,
|
||||
getSelectedListItems: getSelectedListItems
|
||||
};
|
||||
}
|
||||
|
|
@ -682,9 +732,10 @@ define(
|
|||
'tinymce.plugins.lists.core.TextBlock',
|
||||
[
|
||||
'tinymce.core.dom.DOMUtils',
|
||||
'tinymce.core.Env'
|
||||
'tinymce.core.Env',
|
||||
'tinymce.plugins.lists.core.NodeType'
|
||||
],
|
||||
function (DOMUtils, Env) {
|
||||
function (DOMUtils, Env, NodeType) {
|
||||
var DOM = DOMUtils.DOM;
|
||||
|
||||
var createNewTextBlock = function (editor, contentNode, blockName) {
|
||||
|
|
@ -702,7 +753,9 @@ define(
|
|||
DOM.setAttribs(textBlock, editor.settings.forced_root_block_attrs);
|
||||
}
|
||||
|
||||
fragment.appendChild(textBlock);
|
||||
if (!NodeType.isBlock(contentNode.firstChild, blockElements)) {
|
||||
fragment.appendChild(textBlock);
|
||||
}
|
||||
}
|
||||
|
||||
if (contentNode) {
|
||||
|
|
@ -713,7 +766,7 @@ define(
|
|||
hasContentNode = true;
|
||||
}
|
||||
|
||||
if (blockElements[nodeName]) {
|
||||
if (NodeType.isBlock(node, blockElements)) {
|
||||
fragment.appendChild(node);
|
||||
textBlock = null;
|
||||
} else {
|
||||
|
|
@ -1230,17 +1283,40 @@ define(
|
|||
}
|
||||
};
|
||||
|
||||
var toggleList = function (editor, listName, detail) {
|
||||
var parentList = editor.dom.getParent(editor.selection.getStart(), 'OL,UL,DL');
|
||||
var updateList = function (dom, list, listName, detail) {
|
||||
if (list.nodeName !== listName) {
|
||||
var newList = dom.rename(list, listName);
|
||||
updateListWithDetails(dom, newList, detail);
|
||||
} else {
|
||||
updateListWithDetails(dom, list, detail);
|
||||
}
|
||||
};
|
||||
|
||||
detail = detail ? detail : {};
|
||||
var toggleMultipleLists = function (editor, parentList, lists, listName, detail) {
|
||||
if (parentList.nodeName === listName && !hasListStyleDetail(detail)) {
|
||||
removeList(editor, listName);
|
||||
} else {
|
||||
var bookmark = Bookmark.createBookmark(editor.selection.getRng(true));
|
||||
|
||||
Tools.each([parentList].concat(lists), function (elm) {
|
||||
updateList(editor.dom, elm, listName, detail);
|
||||
});
|
||||
|
||||
editor.selection.setRng(Bookmark.resolveBookmark(bookmark));
|
||||
}
|
||||
};
|
||||
|
||||
var hasListStyleDetail = function (detail) {
|
||||
return 'list-style-type' in detail;
|
||||
};
|
||||
|
||||
var toggleSingleList = function (editor, parentList, listName, detail) {
|
||||
if (parentList === editor.getBody()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (parentList) {
|
||||
if (parentList.nodeName === listName) {
|
||||
if (parentList.nodeName === listName && !hasListStyleDetail(detail)) {
|
||||
removeList(editor, listName);
|
||||
} else {
|
||||
var bookmark = Bookmark.createBookmark(editor.selection.getRng(true));
|
||||
|
|
@ -1253,6 +1329,19 @@ define(
|
|||
}
|
||||
};
|
||||
|
||||
var toggleList = function (editor, listName, detail) {
|
||||
var parentList = Selection.getParentList(editor);
|
||||
var selectedSubLists = Selection.getSelectedSubLists(editor);
|
||||
|
||||
detail = detail ? detail : {};
|
||||
|
||||
if (parentList && selectedSubLists.length > 0) {
|
||||
toggleMultipleLists(editor, parentList, selectedSubLists, listName, detail);
|
||||
} else {
|
||||
toggleSingleList(editor, parentList, listName, detail);
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
toggleList: toggleList,
|
||||
removeList: removeList,
|
||||
|
|
@ -1343,6 +1432,30 @@ define(
|
|||
}
|
||||
};
|
||||
|
||||
var hasOnlyOneBlockChild = function (dom, elm) {
|
||||
var childNodes = elm.childNodes;
|
||||
return childNodes.length === 1 && !NodeType.isListNode(childNodes[0]) && dom.isBlock(childNodes[0]);
|
||||
};
|
||||
|
||||
var unwrapSingleBlockChild = function (dom, elm) {
|
||||
if (hasOnlyOneBlockChild(dom, elm)) {
|
||||
dom.remove(elm.firstChild, true);
|
||||
}
|
||||
};
|
||||
|
||||
var moveChildren = function (dom, fromElm, toElm) {
|
||||
var node, targetElm;
|
||||
|
||||
targetElm = hasOnlyOneBlockChild(dom, toElm) ? toElm.firstChild : toElm;
|
||||
unwrapSingleBlockChild(dom, fromElm);
|
||||
|
||||
if (!NodeType.isEmpty(dom, fromElm, true)) {
|
||||
while ((node = fromElm.firstChild)) {
|
||||
targetElm.appendChild(node);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var mergeLiElements = function (dom, fromElm, toElm) {
|
||||
var node, listNode, ul = fromElm.parentNode;
|
||||
|
||||
|
|
@ -1369,11 +1482,7 @@ define(
|
|||
dom.$(toElm).empty();
|
||||
}
|
||||
|
||||
if (!NodeType.isEmpty(dom, fromElm, true)) {
|
||||
while ((node = fromElm.firstChild)) {
|
||||
toElm.appendChild(node);
|
||||
}
|
||||
}
|
||||
moveChildren(dom, fromElm, toElm);
|
||||
|
||||
if (listNode) {
|
||||
toElm.appendChild(listNode);
|
||||
|
|
@ -1386,6 +1495,30 @@ define(
|
|||
}
|
||||
};
|
||||
|
||||
var mergeIntoEmptyLi = function (editor, fromLi, toLi) {
|
||||
editor.dom.$(toLi).empty();
|
||||
mergeLiElements(editor.dom, fromLi, toLi);
|
||||
editor.selection.setCursorLocation(toLi);
|
||||
};
|
||||
|
||||
var mergeForward = function (editor, rng, fromLi, toLi) {
|
||||
var dom = editor.dom;
|
||||
|
||||
if (dom.isEmpty(toLi)) {
|
||||
mergeIntoEmptyLi(editor, fromLi, toLi);
|
||||
} else {
|
||||
var bookmark = Bookmark.createBookmark(rng);
|
||||
mergeLiElements(dom, fromLi, toLi);
|
||||
editor.selection.setRng(Bookmark.resolveBookmark(bookmark));
|
||||
}
|
||||
};
|
||||
|
||||
var mergeBackward = function (editor, rng, fromLi, toLi) {
|
||||
var bookmark = Bookmark.createBookmark(rng);
|
||||
mergeLiElements(editor.dom, fromLi, toLi);
|
||||
editor.selection.setRng(Bookmark.resolveBookmark(bookmark));
|
||||
};
|
||||
|
||||
var backspaceDeleteFromListToListCaret = function (editor, isForward) {
|
||||
var dom = editor.dom, selection = editor.selection;
|
||||
var li = dom.getParent(selection.getStart(), 'LI'), ul, rng, otherLi;
|
||||
|
|
@ -1400,16 +1533,12 @@ define(
|
|||
otherLi = dom.getParent(findNextCaretContainer(editor, rng, isForward), 'LI');
|
||||
|
||||
if (otherLi && otherLi !== li) {
|
||||
var bookmark = Bookmark.createBookmark(rng);
|
||||
|
||||
if (isForward) {
|
||||
mergeLiElements(dom, otherLi, li);
|
||||
mergeForward(editor, rng, otherLi, li);
|
||||
} else {
|
||||
mergeLiElements(dom, li, otherLi);
|
||||
mergeBackward(editor, rng, li, otherLi);
|
||||
}
|
||||
|
||||
editor.selection.setRng(Bookmark.resolveBookmark(bookmark));
|
||||
|
||||
return true;
|
||||
} else if (!otherLi) {
|
||||
if (!isForward && ToggleList.removeList(editor, ul.nodeName)) {
|
||||
|
|
@ -1421,6 +1550,15 @@ define(
|
|||
return false;
|
||||
};
|
||||
|
||||
var removeBlock = function (dom, block) {
|
||||
var parentBlock = dom.getParent(block.parentNode, dom.isBlock);
|
||||
|
||||
dom.remove(block);
|
||||
if (parentBlock && dom.isEmpty(parentBlock)) {
|
||||
dom.remove(parentBlock);
|
||||
}
|
||||
};
|
||||
|
||||
var backspaceDeleteIntoListCaret = function (editor, isForward) {
|
||||
var dom = editor.dom;
|
||||
var block = dom.getParent(editor.selection.getStart(), dom.isBlock);
|
||||
|
|
@ -1431,7 +1569,7 @@ define(
|
|||
|
||||
if (otherLi) {
|
||||
editor.undoManager.transact(function () {
|
||||
dom.remove(block);
|
||||
removeBlock(dom, block);
|
||||
ToggleList.mergeWithAdjacentLists(dom, otherLi.parentNode);
|
||||
editor.selection.select(otherLi, true);
|
||||
editor.selection.collapse(isForward);
|
||||
|
|
@ -1509,9 +1647,10 @@ define(
|
|||
'tinymce.plugins.lists.actions.Outdent',
|
||||
'tinymce.plugins.lists.actions.ToggleList',
|
||||
'tinymce.plugins.lists.core.Delete',
|
||||
'tinymce.plugins.lists.core.NodeType'
|
||||
'tinymce.plugins.lists.core.NodeType',
|
||||
'tinymce.plugins.lists.core.Selection'
|
||||
],
|
||||
function (PluginManager, Tools, VK, Indent, Outdent, ToggleList, Delete, NodeType) {
|
||||
function (PluginManager, Tools, VK, Indent, Outdent, ToggleList, Delete, NodeType, Selection) {
|
||||
var queryListCommandState = function (editor, listName) {
|
||||
return function () {
|
||||
var parentList = editor.dom.getParent(editor.selection.getStart(), 'UL,OL,DL');
|
||||
|
|
@ -1617,15 +1756,8 @@ define(
|
|||
var ctrl = e.control;
|
||||
|
||||
editor.on('nodechange', function () {
|
||||
var blocks = editor.selection.getSelectedBlocks();
|
||||
var disable = false;
|
||||
|
||||
for (var i = 0, l = blocks.length; !disable && i < l; i++) {
|
||||
var tag = blocks[i].nodeName;
|
||||
|
||||
disable = (tag === 'LI' && NodeType.isFirstChild(blocks[i]) || tag === 'UL' || tag === 'OL' || tag === 'DD');
|
||||
}
|
||||
|
||||
var listItemBlocks = Selection.getSelectedListItems(editor);
|
||||
var disable = listItemBlocks.length > 0 && NodeType.isFirstChild(listItemBlocks[0]);
|
||||
ctrl.disabled(disable);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
|
@ -1 +1 @@
|
|||
.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}.mce-content-body p,.mce-content-body div,.mce-content-body h1,.mce-content-body h2,.mce-content-body h3,.mce-content-body h4,.mce-content-body h5,.mce-content-body h6{line-height:1.2em}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-content-body a[data-mce-selected],.mce-content-body code[data-mce-selected]{background:#bfe6ff}.mce-content-body hr{cursor:default}
|
||||
.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-content-body a[data-mce-selected],.mce-content-body code[data-mce-selected],.mce-content-body b[data-mce-selected],.mce-content-body i[data-mce-selected],.mce-content-body em[data-mce-selected],.mce-content-body strong[data-mce-selected],.mce-content-body sup[data-mce-selected],.mce-content-body sub[data-mce-selected]{background:#bfe6ff}.mce-content-body hr{cursor:default}.mce-content-body{line-height:1.3}
|
||||
|
|
@ -1 +1 @@
|
|||
body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}.mce-content-body p,.mce-content-body div,.mce-content-body h1,.mce-content-body h2,.mce-content-body h3,.mce-content-body h4,.mce-content-body h5,.mce-content-body h6{line-height:1.2em}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-content-body a[data-mce-selected],.mce-content-body code[data-mce-selected]{background:#bfe6ff}.mce-content-body hr{cursor:default}
|
||||
body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-content-body a[data-mce-selected],.mce-content-body code[data-mce-selected],.mce-content-body b[data-mce-selected],.mce-content-body i[data-mce-selected],.mce-content-body em[data-mce-selected],.mce-content-body strong[data-mce-selected],.mce-content-body sup[data-mce-selected],.mce-content-body sub[data-mce-selected]{background:#bfe6ff}.mce-content-body hr{cursor:default}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -21,18 +21,6 @@ body {
|
|||
word-wrap: break-word; /* Old syntax */
|
||||
}
|
||||
|
||||
/* Changed in 4.6.0, see https://core.trac.wordpress.org/ticket/40743 */
|
||||
.mce-content-body p,
|
||||
.mce-content-body div,
|
||||
.mce-content-body h1,
|
||||
.mce-content-body h2,
|
||||
.mce-content-body h3,
|
||||
.mce-content-body h4,
|
||||
.mce-content-body h5,
|
||||
.mce-content-body h6 {
|
||||
line-height: inherit;
|
||||
}
|
||||
|
||||
body.rtl {
|
||||
font-family: Tahoma, "Times New Roman", "Bitstream Charter", Times, serif;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ var defineGlobal = function (id, ref) {
|
|||
define(id, [], function () { return ref; });
|
||||
};
|
||||
/*jsc
|
||||
["tinymce.themes.inlite.Theme","tinymce.core.ThemeManager","tinymce.core.ui.Api","tinymce.core.util.Delay","tinymce.themes.inlite.alien.Arr","tinymce.themes.inlite.alien.EditorSettings","tinymce.themes.inlite.core.ElementMatcher","tinymce.themes.inlite.core.Matcher","tinymce.themes.inlite.core.PredicateId","tinymce.themes.inlite.core.SelectionMatcher","tinymce.themes.inlite.core.SkinLoader","tinymce.themes.inlite.ui.Buttons","tinymce.themes.inlite.ui.Panel","global!tinymce.util.Tools.resolve","tinymce.themes.inlite.alien.Type","tinymce.themes.inlite.core.Measure","tinymce.core.util.Tools","tinymce.core.EditorManager","tinymce.core.dom.DOMUtils","tinymce.core.ui.Factory","tinymce.themes.inlite.ui.Toolbar","tinymce.themes.inlite.ui.Forms","tinymce.themes.inlite.core.Layout","tinymce.themes.inlite.file.Conversions","tinymce.themes.inlite.file.Picker","tinymce.themes.inlite.core.Actions","tinymce.core.geom.Rect","tinymce.themes.inlite.core.Convert","tinymce.core.util.Promise","tinymce.themes.inlite.alien.Uuid","tinymce.themes.inlite.alien.Unlink","tinymce.themes.inlite.core.UrlType","tinymce.themes.inlite.alien.Bookmark","tinymce.core.dom.TreeWalker","tinymce.core.dom.RangeUtils"]
|
||||
["tinymce.themes.inlite.Theme","tinymce.core.ThemeManager","tinymce.core.ui.Api","tinymce.core.util.Delay","tinymce.themes.inlite.alien.Arr","tinymce.themes.inlite.alien.EditorSettings","tinymce.themes.inlite.core.ElementMatcher","tinymce.themes.inlite.core.Matcher","tinymce.themes.inlite.core.PredicateId","tinymce.themes.inlite.core.SelectionMatcher","tinymce.themes.inlite.core.SkinLoader","tinymce.themes.inlite.ui.Buttons","tinymce.themes.inlite.ui.Panel","global!tinymce.util.Tools.resolve","tinymce.themes.inlite.alien.Type","tinymce.themes.inlite.core.Measure","tinymce.core.util.Tools","tinymce.core.EditorManager","tinymce.core.dom.DOMUtils","tinymce.core.ui.Factory","tinymce.themes.inlite.ui.Toolbar","tinymce.themes.inlite.ui.Forms","tinymce.themes.inlite.core.Layout","tinymce.themes.inlite.file.Conversions","tinymce.themes.inlite.file.Picker","tinymce.themes.inlite.core.Actions","tinymce.themes.inlite.core.Convert","tinymce.core.util.Promise","tinymce.themes.inlite.alien.Uuid","tinymce.themes.inlite.alien.Unlink","tinymce.themes.inlite.core.UrlType","tinymce.core.geom.Rect","tinymce.themes.inlite.alien.Bookmark","tinymce.core.dom.TreeWalker","tinymce.core.dom.RangeUtils"]
|
||||
jsc*/
|
||||
defineGlobal("global!tinymce.util.Tools.resolve", tinymce.util.Tools.resolve);
|
||||
/**
|
||||
|
|
@ -359,26 +359,6 @@ define(
|
|||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* ResolveGlobal.js
|
||||
*
|
||||
* Released under LGPL License.
|
||||
* Copyright (c) 1999-2017 Ephox Corp. All rights reserved
|
||||
*
|
||||
* License: http://www.tinymce.com/license
|
||||
* Contributing: http://www.tinymce.com/contributing
|
||||
*/
|
||||
|
||||
define(
|
||||
'tinymce.core.geom.Rect',
|
||||
[
|
||||
'global!tinymce.util.Tools.resolve'
|
||||
],
|
||||
function (resolve) {
|
||||
return resolve('tinymce.geom.Rect');
|
||||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* Convert.js
|
||||
*
|
||||
|
|
@ -435,10 +415,9 @@ define(
|
|||
'tinymce.themes.inlite.core.Measure',
|
||||
[
|
||||
'tinymce.core.dom.DOMUtils',
|
||||
'tinymce.core.geom.Rect',
|
||||
'tinymce.themes.inlite.core.Convert'
|
||||
],
|
||||
function (DOMUtils, Rect, Convert) {
|
||||
function (DOMUtils, Convert) {
|
||||
var toAbsolute = function (rect) {
|
||||
var vp = DOMUtils.DOM.getViewPort();
|
||||
|
||||
|
|
@ -1468,6 +1447,26 @@ define(
|
|||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* ResolveGlobal.js
|
||||
*
|
||||
* Released under LGPL License.
|
||||
* Copyright (c) 1999-2017 Ephox Corp. All rights reserved
|
||||
*
|
||||
* License: http://www.tinymce.com/license
|
||||
* Contributing: http://www.tinymce.com/contributing
|
||||
*/
|
||||
|
||||
define(
|
||||
'tinymce.core.geom.Rect',
|
||||
[
|
||||
'global!tinymce.util.Tools.resolve'
|
||||
],
|
||||
function (resolve) {
|
||||
return resolve('tinymce.geom.Rect');
|
||||
}
|
||||
);
|
||||
|
||||
/**
|
||||
* Layout.js
|
||||
*
|
||||
|
|
@ -1499,8 +1498,15 @@ define(
|
|||
var calcByPositions = function (testPositions1, testPositions2, targetRect, contentAreaRect, panelRect) {
|
||||
var relPos, relRect, outputPanelRect;
|
||||
|
||||
relPos = Rect.findBestRelativePosition(panelRect, targetRect, contentAreaRect, testPositions1);
|
||||
targetRect = Rect.clamp(targetRect, contentAreaRect);
|
||||
var paddedContentRect = {
|
||||
x: contentAreaRect.x,
|
||||
y: contentAreaRect.y,
|
||||
w: contentAreaRect.w + (contentAreaRect.w < (panelRect.w + targetRect.w) ? panelRect.w : 0),
|
||||
h: contentAreaRect.h + (contentAreaRect.h < (panelRect.h + targetRect.h) ? panelRect.h : 0)
|
||||
};
|
||||
|
||||
relPos = Rect.findBestRelativePosition(panelRect, targetRect, paddedContentRect, testPositions1);
|
||||
targetRect = Rect.clamp(targetRect, paddedContentRect);
|
||||
|
||||
if (relPos) {
|
||||
relRect = Rect.relativePosition(panelRect, targetRect, relPos);
|
||||
|
|
@ -1508,9 +1514,10 @@ define(
|
|||
return result(outputPanelRect, relPos);
|
||||
}
|
||||
|
||||
targetRect = Rect.intersect(contentAreaRect, targetRect);
|
||||
targetRect = Rect.intersect(paddedContentRect, targetRect);
|
||||
if (targetRect) {
|
||||
relPos = Rect.findBestRelativePosition(panelRect, targetRect, contentAreaRect, testPositions2);
|
||||
relPos = Rect.findBestRelativePosition(panelRect, targetRect, paddedContentRect, testPositions2);
|
||||
|
||||
if (relPos) {
|
||||
relRect = Rect.relativePosition(panelRect, targetRect, relPos);
|
||||
outputPanelRect = moveTo(panelRect, relRect);
|
||||
|
|
@ -1536,8 +1543,8 @@ define(
|
|||
|
||||
var calc = function (targetRect, contentAreaRect, panelRect) {
|
||||
return calcByPositions(
|
||||
['tc-bc', 'bc-tc', 'tl-bl', 'bl-tl', 'tr-br', 'br-tr'],
|
||||
['bc-tc', 'bl-tl', 'br-tr'],
|
||||
['tc-bc', 'bc-tc', 'tl-bl', 'bl-tl', 'tr-br', 'br-tr', 'cr-cl', 'cl-cr'],
|
||||
['bc-tc', 'bl-tl', 'br-tr', 'cr-cl'],
|
||||
targetRect,
|
||||
contentAreaRect,
|
||||
panelRect
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
2
wp-includes/js/tinymce/tiny_mce_popup.js
vendored
2
wp-includes/js/tinymce/tiny_mce_popup.js
vendored
|
|
@ -53,7 +53,7 @@ var tinyMCEPopup = {
|
|||
}
|
||||
|
||||
// Setup local DOM
|
||||
self.dom = self.editor.windowManager.createInstance('tinymce.plugins.dom.DOMUtils', document, {
|
||||
self.dom = self.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document, {
|
||||
ownEvents: true,
|
||||
proxy: tinyMCEPopup._eventProxy
|
||||
});
|
||||
|
|
|
|||
33
wp-includes/js/tinymce/tinymce.min.js
vendored
33
wp-includes/js/tinymce/tinymce.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
function MCTabs() {
|
||||
this.settings = [];
|
||||
this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.plugins.util.Dispatcher');
|
||||
this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
|
||||
}
|
||||
|
||||
MCTabs.prototype.init = function (settings) {
|
||||
|
|
@ -155,7 +155,7 @@ tinyMCEPopup.onInit.add(function () {
|
|||
dom.setAttrib(a, 'tabindex', '-1');
|
||||
});
|
||||
|
||||
/*keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.plugins.ui.KeyboardNavigation', {
|
||||
/*keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
|
||||
root: tabContainerElm,
|
||||
items: items,
|
||||
onAction: action,
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.9-alpha-41603';
|
||||
$wp_version = '4.9-alpha-41604';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
@ -18,7 +18,7 @@ $wp_db_version = 38590;
|
|||
*
|
||||
* @global string $tinymce_version
|
||||
*/
|
||||
$tinymce_version = '4603-20170530';
|
||||
$tinymce_version = '4607-20170918';
|
||||
|
||||
/**
|
||||
* Holds the required PHP version
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user