diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/js/tinymce/themes/modern/theme.js --- a/wp/wp-includes/js/tinymce/themes/modern/theme.js Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/js/tinymce/themes/modern/theme.js Tue Dec 15 13:49:49 2020 +0100 @@ -150,10 +150,6 @@ var global$7 = tinymce.util.Tools.resolve('tinymce.util.Delay'); var noop = function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } }; var constant = function (value) { return function () { @@ -163,8 +159,6 @@ var never = constant(false); var always = constant(true); - var never$1 = never; - var always$1 = always; var none = function () { return NONE; }; @@ -178,37 +172,27 @@ var id = function (n) { return n; }; - var noop = function () { - }; - var nul = function () { - return null; - }; - var undef = function () { - return undefined; - }; var me = { fold: function (n, s) { return n(); }, - is: never$1, - isSome: never$1, - isNone: always$1, + is: never, + isSome: never, + isNone: always, getOr: id, getOrThunk: call, getOrDie: function (msg) { throw new Error(msg || 'error: getOrDie called on none.'); }, - getOrNull: nul, - getOrUndefined: undef, + getOrNull: constant(null), + getOrUndefined: constant(undefined), or: id, orThunk: call, map: none, - ap: none, each: noop, bind: none, - flatten: none, - exists: never$1, - forall: always$1, + exists: never, + forall: always, filter: none, equals: eq, equals_: eq, @@ -217,20 +201,16 @@ }, toString: constant('none()') }; - if (Object.freeze) + if (Object.freeze) { Object.freeze(me); + } return me; }(); var some = function (a) { - var constant_a = function () { - return a; - }; + var constant_a = constant(a); var self = function () { return me; }; - var map = function (f) { - return some(f(a)); - }; var bind = function (f) { return f(a); }; @@ -241,8 +221,8 @@ is: function (v) { return a === v; }, - isSome: always$1, - isNone: never$1, + isSome: always, + isNone: never, getOr: constant_a, getOrThunk: constant_a, getOrDie: constant_a, @@ -250,35 +230,31 @@ getOrUndefined: constant_a, or: self, orThunk: self, - map: map, - ap: function (optfab) { - return optfab.fold(none, function (fab) { - return some(fab(a)); - }); + map: function (f) { + return some(f(a)); }, each: function (f) { f(a); }, bind: bind, - flatten: constant_a, exists: bind, forall: bind, filter: function (f) { return f(a) ? me : NONE; }, - equals: function (o) { - return o.is(a); - }, - equals_: function (o, elementEq) { - return o.fold(never$1, function (b) { - return elementEq(a, b); - }); - }, toArray: function () { return [a]; }, toString: function () { return 'some(' + a + ')'; + }, + equals: function (o) { + return o.is(a); + }, + equals_: function (o, elementEq) { + return o.fold(never, function (b) { + return elementEq(a, b); + }); } }; return me; @@ -667,13 +643,16 @@ var ContextToolbars = { addContextualToolbars: addContextualToolbars }; var typeOf = function (x) { - if (x === null) + if (x === null) { return 'null'; + } var t = typeof x; - if (t === 'object' && Array.prototype.isPrototypeOf(x)) + if (t === 'object' && (Array.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'Array')) { return 'array'; - if (t === 'object' && String.prototype.isPrototypeOf(x)) + } + if (t === 'object' && (String.prototype.isPrototypeOf(x) || x.constructor && x.constructor.name === 'String')) { return 'string'; + } return t; }; var isType = function (type) { @@ -681,46 +660,49 @@ return typeOf(value) === type; }; }; + var isArray = isType('array'); var isFunction = isType('function'); var isNumber = isType('number'); - var rawIndexOf = function () { - var pIndexOf = Array.prototype.indexOf; - var fastIndex = function (xs, x) { - return pIndexOf.call(xs, x); - }; - var slowIndex = function (xs, x) { - return slowIndexOf(xs, x); - }; - return pIndexOf === undefined ? slowIndex : fastIndex; - }(); + var nativeSlice = Array.prototype.slice; + var nativeIndexOf = Array.prototype.indexOf; + var nativePush = Array.prototype.push; + var rawIndexOf = function (ts, t) { + return nativeIndexOf.call(ts, t); + }; var indexOf = function (xs, x) { var r = rawIndexOf(xs, x); return r === -1 ? Option.none() : Option.some(r); }; var exists = function (xs, pred) { - return findIndex(xs, pred).isSome(); + for (var i = 0, len = xs.length; i < len; i++) { + var x = xs[i]; + if (pred(x, i)) { + return true; + } + } + return false; }; var map = function (xs, f) { var len = xs.length; var r = new Array(len); for (var i = 0; i < len; i++) { var x = xs[i]; - r[i] = f(x, i, xs); + r[i] = f(x, i); } return r; }; var each = function (xs, f) { for (var i = 0, len = xs.length; i < len; i++) { var x = xs[i]; - f(x, i, xs); + f(x, i); } }; var filter = function (xs, pred) { var r = []; for (var i = 0, len = xs.length; i < len; i++) { var x = xs[i]; - if (pred(x, i, xs)) { + if (pred(x, i)) { r.push(x); } } @@ -735,7 +717,7 @@ var find = function (xs, pred) { for (var i = 0, len = xs.length; i < len; i++) { var x = xs[i]; - if (pred(x, i, xs)) { + if (pred(x, i)) { return Option.some(x); } } @@ -744,33 +726,24 @@ var findIndex = function (xs, pred) { for (var i = 0, len = xs.length; i < len; i++) { var x = xs[i]; - if (pred(x, i, xs)) { + if (pred(x, i)) { return Option.some(i); } } return Option.none(); }; - var slowIndexOf = function (xs, x) { - for (var i = 0, len = xs.length; i < len; ++i) { - if (xs[i] === x) { - return i; - } - } - return -1; - }; - var push = Array.prototype.push; var flatten = function (xs) { var r = []; for (var i = 0, len = xs.length; i < len; ++i) { - if (!Array.prototype.isPrototypeOf(xs[i])) + if (!isArray(xs[i])) { throw new Error('Arr.flatten item ' + i + ' was not an array, input: ' + xs); - push.apply(r, xs[i]); + } + nativePush.apply(r, xs[i]); } return r; }; - var slice = Array.prototype.slice; var from$1 = isFunction(Array.from) ? Array.from : function (x) { - return slice.call(x); + return nativeSlice.call(x); }; var defaultMenus = { @@ -826,11 +799,11 @@ var menuItemsPass1 = filter(namedMenuItems, function (namedMenuItem) { return removedMenuItems.hasOwnProperty(namedMenuItem.name) === false; }); - var menuItemsPass2 = filter(menuItemsPass1, function (namedMenuItem, i, namedMenuItems) { - return !isSeparator(namedMenuItem) || !isSeparator(namedMenuItems[i - 1]); + var menuItemsPass2 = filter(menuItemsPass1, function (namedMenuItem, i) { + return !isSeparator(namedMenuItem) || !isSeparator(menuItemsPass1[i - 1]); }); - return filter(menuItemsPass2, function (namedMenuItem, i, namedMenuItems) { - return !isSeparator(namedMenuItem) || i > 0 && i < namedMenuItems.length - 1; + return filter(menuItemsPass2, function (namedMenuItem, i) { + return !isSeparator(namedMenuItem) || i > 0 && i < menuItemsPass2.length - 1; }); }; var createMenu = function (editorMenuItems, menus, removedMenuItems, context) { @@ -1769,7 +1742,7 @@ }); var Collection$1, proto; - var push$1 = Array.prototype.push, slice$1 = Array.prototype.slice; + var push = Array.prototype.push, slice = Array.prototype.slice; proto = { length: 0, init: function (items) { @@ -1783,10 +1756,10 @@ if (items instanceof Collection$1) { self.add(items.toArray()); } else { - push$1.call(self, items); + push.call(self, items); } } else { - push$1.apply(self, items); + push.apply(self, items); } return self; }, @@ -1823,7 +1796,7 @@ return new Collection$1(matches); }, slice: function () { - return new Collection$1(slice$1.apply(this, arguments)); + return new Collection$1(slice.apply(this, arguments)); }, eq: function (index) { return index === -1 ? this.slice(index) : this.slice(index, +index + 1); @@ -4754,7 +4727,7 @@ return NotificationManagerImpl(editor); }; var getWindowManagerImpl = function () { - return WindowManagerImpl(editor); + return WindowManagerImpl(); }; return { renderUI: renderUI, @@ -4991,9 +4964,10 @@ global$9(input).on('click', function (e) { e.stopPropagation(); }); - global$9(self.getEl('button')).on('click', function (e) { + global$9(self.getEl('button')).on('click touchstart', function (e) { e.stopPropagation(); input.click(); + e.preventDefault(); }); self.getEl().appendChild(input); }, @@ -6091,6 +6065,32 @@ var ENTITY = domGlobals.Node.ENTITY_NODE; var NOTATION = domGlobals.Node.NOTATION_NODE; + var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')(); + + var path = function (parts, scope) { + var o = scope !== undefined && scope !== null ? scope : Global; + for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) { + o = o[parts[i]]; + } + return o; + }; + var resolve = function (p, scope) { + var parts = p.split('.'); + return path(parts, scope); + }; + + var unsafe = function (name, scope) { + return resolve(name, scope); + }; + var getOrDie = function (name, scope) { + var actual = unsafe(name, scope); + if (actual === undefined || actual === null) { + throw new Error(name + ' not available on this browser'); + } + return actual; + }; + var Global$1 = { getOrDie: getOrDie }; + var Immutable = function () { var fields = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -6112,30 +6112,6 @@ }; }; - var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')(); - - var path = function (parts, scope) { - var o = scope !== undefined && scope !== null ? scope : Global; - for (var i = 0; i < parts.length && o !== undefined && o !== null; ++i) - o = o[parts[i]]; - return o; - }; - var resolve = function (p, scope) { - var parts = p.split('.'); - return path(parts, scope); - }; - - var unsafe = function (name, scope) { - return resolve(name, scope); - }; - var getOrDie = function (name, scope) { - var actual = unsafe(name, scope); - if (actual === undefined || actual === null) - throw name + ' not available on this browser'; - return actual; - }; - var Global$1 = { getOrDie: getOrDie }; - var node = function () { var f = Global$1.getOrDie('Node'); return f; @@ -6157,18 +6133,20 @@ var firstMatch = function (regexes, s) { for (var i = 0; i < regexes.length; i++) { var x = regexes[i]; - if (x.test(s)) + if (x.test(s)) { return x; + } } return undefined; }; var find$1 = function (regexes, agent) { var r = firstMatch(regexes, agent); - if (!r) + if (!r) { return { major: 0, minor: 0 }; + } var group = function (i) { return Number(agent.replace(r, '$' + i)); }; @@ -6176,8 +6154,9 @@ }; var detect = function (versionRegexes, agent) { var cleanedAgent = String(agent).toLowerCase(); - if (versionRegexes.length === 0) + if (versionRegexes.length === 0) { return unknown(); + } return find$1(versionRegexes, cleanedAgent); }; var unknown = function () { @@ -6347,8 +6326,7 @@ name: 'Edge', versionRegexes: [/.*?edge\/ ?([0-9]+)\.([0-9]+)$/], search: function (uastring) { - var monstrosity = contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit'); - return monstrosity; + return contains(uastring, 'edge/') && contains(uastring, 'chrome') && contains(uastring, 'safari') && contains(uastring, 'applewebkit'); } }, { @@ -7672,11 +7650,11 @@ return menuItem && menuItem.text === '-'; }; var trimMenuItems = function (menuItems) { - var menuItems2 = filter(menuItems, function (menuItem, i, menuItems) { + var menuItems2 = filter(menuItems, function (menuItem, i) { return !isSeparator$1(menuItem) || !isSeparator$1(menuItems[i - 1]); }); - return filter(menuItems2, function (menuItem, i, menuItems) { - return !isSeparator$1(menuItem) || i > 0 && i < menuItems.length - 1; + return filter(menuItems2, function (menuItem, i) { + return !isSeparator$1(menuItem) || i > 0 && i < menuItems2.length - 1; }); }; var createContextMenuItems = function (editor, context) {