MDL-78251 editor_tiny: Update TinyMCE to 6.6.2
Originally I changed the compiled output of TinyMCE from es2015 to es6 to try and allow our own requirejs system to serve the content. This is a change in the TinyMCE repository (or our copy of it). Unfortunately this turned out to not be possible, but I never got around to updating the configuration to stop doing so. Whilst working on this issue, I've removed this change to module compilation, which brings us closer in line to Tiny core, and simplifies the upgrade process.
This commit is contained in:
Andrew Nicols
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* TinyMCE version 6.3.2 (2023-02-22)
|
||||
* TinyMCE version 6.6.2 (2023-08-09)
|
||||
*/
|
||||
|
||||
(function () {
|
||||
@@ -22,10 +22,11 @@
|
||||
var global$3 = tinymce.util.Tools.resolve('tinymce.PluginManager');
|
||||
|
||||
const hasProto = (v, constructor, predicate) => {
|
||||
var _a;
|
||||
if (predicate(v, constructor.prototype)) {
|
||||
return true;
|
||||
} else {
|
||||
return v.constructor?.name === constructor.name;
|
||||
return ((_a = v.constructor) === null || _a === void 0 ? void 0 : _a.name) === constructor.name;
|
||||
}
|
||||
};
|
||||
const typeOf = x => {
|
||||
@@ -58,7 +59,7 @@
|
||||
};
|
||||
const always = constant(true);
|
||||
|
||||
const punctuationStr = '[!-#%-*,-\\/:;?@\\[-\\]_{}\xA1\xAB\xB7\xBB\xBF;\xB7\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1361-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u3008\u3009\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30\u2E31\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uff3f\uFF5B\uFF5D\uFF5F-\uFF65]';
|
||||
const punctuationStr = `[~\u2116|!-*+-\\/:;?@\\[-\`{}\u00A1\u00AB\u00B7\u00BB\u00BF;\u00B7\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1361-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u3008\u3009\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30\u2E31\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]`;
|
||||
|
||||
const punctuation$1 = constant(punctuationStr);
|
||||
|
||||
@@ -127,7 +128,7 @@
|
||||
}
|
||||
getOrDie(message) {
|
||||
if (!this.tag) {
|
||||
throw new Error(message ?? 'Called getOrDie on None');
|
||||
throw new Error(message !== null && message !== void 0 ? message : 'Called getOrDie on None');
|
||||
} else {
|
||||
return this.value;
|
||||
}
|
||||
@@ -397,10 +398,11 @@
|
||||
}
|
||||
};
|
||||
const collectTextToBoundary = (dom, section, node, rootNode, forwards) => {
|
||||
var _a;
|
||||
if (isBoundary(dom, node)) {
|
||||
return;
|
||||
}
|
||||
const rootBlock = dom.getParent(rootNode, dom.isBlock) ?? dom.getRoot();
|
||||
const rootBlock = (_a = dom.getParent(rootNode, dom.isBlock)) !== null && _a !== void 0 ? _a : dom.getRoot();
|
||||
const walker = new global(node, rootBlock);
|
||||
const walkerFn = forwards ? walker.next.bind(walker) : walker.prev.bind(walker);
|
||||
walk(dom, walkerFn, node, {
|
||||
@@ -583,11 +585,12 @@
|
||||
}
|
||||
};
|
||||
const unwrap = node => {
|
||||
var _a;
|
||||
const parentNode = node.parentNode;
|
||||
if (node.firstChild) {
|
||||
parentNode.insertBefore(node.firstChild, node);
|
||||
}
|
||||
node.parentNode?.removeChild(node);
|
||||
(_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(node);
|
||||
};
|
||||
const findSpansByIndex = (editor, index) => {
|
||||
const spans = [];
|
||||
@@ -851,10 +854,8 @@
|
||||
const toggle = name => api.setEnabled(name, !disable);
|
||||
each(buttons, toggle);
|
||||
};
|
||||
const notFoundAlert = api => {
|
||||
editor.windowManager.alert('Could not find the specified string.', () => {
|
||||
api.focus('findtext');
|
||||
});
|
||||
const toggleNotFoundAlert = (isVisible, api) => {
|
||||
api.redial(getDialogSpec(isVisible, api.getData()));
|
||||
};
|
||||
const focusButtonIfRequired = (api, name) => {
|
||||
if (global$2.browser.isSafari() && global$2.deviceType.isTouch() && (name === 'find' || name === 'replace' || name === 'replaceall')) {
|
||||
@@ -878,7 +879,7 @@
|
||||
} else {
|
||||
const count = find(editor, currentSearchState, data.findtext, data.matchcase, data.wholewords, data.inselection);
|
||||
if (count <= 0) {
|
||||
notFoundAlert(api);
|
||||
toggleNotFoundAlert(true, api);
|
||||
}
|
||||
disableAll(api, count === 0);
|
||||
}
|
||||
@@ -892,47 +893,59 @@
|
||||
matchcase: initialState.matchCase,
|
||||
inselection: initialState.inSelection
|
||||
};
|
||||
const spec = {
|
||||
const getPanelItems = error => {
|
||||
const items = [
|
||||
{
|
||||
type: 'bar',
|
||||
items: [
|
||||
{
|
||||
type: 'input',
|
||||
name: 'findtext',
|
||||
placeholder: 'Find',
|
||||
maximized: true,
|
||||
inputMode: 'search'
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
name: 'prev',
|
||||
text: 'Previous',
|
||||
icon: 'action-prev',
|
||||
enabled: false,
|
||||
borderless: true
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
name: 'next',
|
||||
text: 'Next',
|
||||
icon: 'action-next',
|
||||
enabled: false,
|
||||
borderless: true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
name: 'replacetext',
|
||||
placeholder: 'Replace with',
|
||||
inputMode: 'search'
|
||||
}
|
||||
];
|
||||
if (error) {
|
||||
items.push({
|
||||
type: 'alertbanner',
|
||||
level: 'error',
|
||||
text: 'Could not find the specified string.',
|
||||
icon: 'warning'
|
||||
});
|
||||
}
|
||||
return items;
|
||||
};
|
||||
const getDialogSpec = (showNoMatchesAlertBanner, initialData) => ({
|
||||
title: 'Find and Replace',
|
||||
size: 'normal',
|
||||
body: {
|
||||
type: 'panel',
|
||||
items: [
|
||||
{
|
||||
type: 'bar',
|
||||
items: [
|
||||
{
|
||||
type: 'input',
|
||||
name: 'findtext',
|
||||
placeholder: 'Find',
|
||||
maximized: true,
|
||||
inputMode: 'search'
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
name: 'prev',
|
||||
text: 'Previous',
|
||||
icon: 'action-prev',
|
||||
enabled: false,
|
||||
borderless: true
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
name: 'next',
|
||||
text: 'Next',
|
||||
icon: 'action-next',
|
||||
enabled: false,
|
||||
borderless: true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
name: 'replacetext',
|
||||
placeholder: 'Replace with',
|
||||
inputMode: 'search'
|
||||
}
|
||||
]
|
||||
items: getPanelItems(showNoMatchesAlertBanner)
|
||||
},
|
||||
buttons: [
|
||||
{
|
||||
@@ -980,6 +993,9 @@
|
||||
],
|
||||
initialData,
|
||||
onChange: (api, details) => {
|
||||
if (showNoMatchesAlertBanner) {
|
||||
toggleNotFoundAlert(false, api);
|
||||
}
|
||||
if (details.name === 'findtext' && currentSearchState.get().count > 0) {
|
||||
reset(api);
|
||||
}
|
||||
@@ -1012,6 +1028,7 @@
|
||||
case 'matchcase':
|
||||
case 'wholewords':
|
||||
case 'inselection':
|
||||
toggleNotFoundAlert(false, api);
|
||||
updateSearchState(api);
|
||||
reset(api);
|
||||
break;
|
||||
@@ -1027,8 +1044,8 @@
|
||||
done(editor, currentSearchState);
|
||||
editor.undoManager.add();
|
||||
}
|
||||
};
|
||||
dialogApi.set(editor.windowManager.open(spec, { inline: 'toolbar' }));
|
||||
});
|
||||
dialogApi.set(editor.windowManager.open(getDialogSpec(false, initialData), { inline: 'toolbar' }));
|
||||
};
|
||||
|
||||
const register$1 = (editor, currentSearchState) => {
|
||||
|
||||
Reference in New Issue
Block a user