Props hareesh-pillai, azaozz.
Fixes #50431.

git-svn-id: https://develop.svn.wordpress.org/trunk@48158 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2020-06-24 22:04:36 +00:00
parent 07e3dda9ba
commit 67839d5a62
18 changed files with 1012 additions and 957 deletions

View File

@ -1,3 +1,8 @@
/*
* Edited for compatibility with old TinyMCE 3.x plugins in WordPress.
* More info: https://core.trac.wordpress.org/ticket/31596#comment:10
*/
/* Generic */
body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;

View File

@ -44,7 +44,7 @@
this.add = function (callback, scope, prepend) {
log('<target>.on' + newEventName + ".add(..)");
// Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2).
// Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2)
function patchedEventCallback(e) {
var callbackArgs = [];

View File

@ -204,6 +204,8 @@ var lists = (function (domGlobals) {
resolveBookmark: resolveBookmark
};
var noop = function () {
};
var constant = function (value) {
return function () {
return value;
@ -221,8 +223,6 @@ var lists = (function (domGlobals) {
var never = constant(false);
var always = constant(true);
var never$1 = never;
var always$1 = always;
var none = function () {
return NONE;
};
@ -236,37 +236,27 @@ var lists = (function (domGlobals) {
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,
@ -281,15 +271,10 @@ var lists = (function (domGlobals) {
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);
};
@ -300,8 +285,8 @@ var lists = (function (domGlobals) {
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,
@ -309,35 +294,31 @@ var lists = (function (domGlobals) {
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;
@ -375,27 +356,28 @@ var lists = (function (domGlobals) {
var isFunction = isType('function');
var isNumber = isType('number');
var slice = Array.prototype.slice;
var nativeSlice = Array.prototype.slice;
var nativePush = Array.prototype.push;
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);
}
}
@ -433,20 +415,19 @@ var lists = (function (domGlobals) {
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);
}
}
return Option.none();
};
var push = Array.prototype.push;
var flatten = function (xs) {
var r = [];
for (var i = 0, len = xs.length; i < len; ++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;
};
@ -455,7 +436,7 @@ var lists = (function (domGlobals) {
return flatten(output);
};
var reverse = function (xs) {
var r = slice.call(xs, 0);
var r = nativeSlice.call(xs, 0);
r.reverse();
return r;
};
@ -466,7 +447,7 @@ var lists = (function (domGlobals) {
return xs.length === 0 ? Option.none() : Option.some(xs[xs.length - 1]);
};
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
return slice.call(x);
return nativeSlice.call(x);
};
var Global = typeof domGlobals.window !== 'undefined' ? domGlobals.window : Function('return this;')();
@ -621,17 +602,8 @@ var lists = (function (domGlobals) {
fromPoint: fromPoint
};
var liftN = function (arr, f) {
var r = [];
for (var i = 0; i < arr.length; i++) {
var x = arr[i];
if (x.isSome()) {
r.push(x.getOrDie());
} else {
return Option.none();
}
}
return Option.some(f.apply(null, r));
var lift2 = function (oa, ob, f) {
return oa.isSome() && ob.isSome() ? Option.some(f(oa.getOrDie(), ob.getOrDie())) : Option.none();
};
var fromElements = function (elements, scope) {
@ -670,7 +642,7 @@ var lists = (function (domGlobals) {
for (var k = 0, len = props.length; k < len; k++) {
var i = props[k];
var x = obj[i];
f(x, i, obj);
f(x, i);
}
};
@ -1197,10 +1169,7 @@ var lists = (function (domGlobals) {
}
};
var appendSegments = function (head$1, tail) {
liftN([
last(head$1),
head(tail)
], joinSegment);
lift2(last(head$1), head(tail), joinSegment);
};
var createSegment = function (scope, listType) {
var segment = {
@ -1497,10 +1466,7 @@ var lists = (function (domGlobals) {
};
var getItemSelection = function (editor) {
var selectedListItems = map(Selection.getSelectedListItems(editor), Element.fromDom);
return liftN([
find(selectedListItems, not(hasFirstChildList)),
find(reverse(selectedListItems), not(hasFirstChildList))
], function (start, end) {
return lift2(find(selectedListItems, not(hasFirstChildList)), find(reverse(selectedListItems), not(hasFirstChildList)), function (start, end) {
return {
start: start,
end: end

File diff suppressed because one or more lines are too long

View File

@ -47,9 +47,154 @@ var media = (function () {
hasDimensions: hasDimensions
};
var global$3 = tinymce.util.Tools.resolve('tinymce.html.SaxParser');
var Cell = function (initial) {
var value = initial;
var get = function () {
return value;
};
var set = function (v) {
value = v;
};
var clone = function () {
return Cell(get());
};
return {
get: get,
set: set,
clone: clone
};
};
var global$4 = tinymce.util.Tools.resolve('tinymce.dom.DOMUtils');
var noop = function () {
};
var constant = function (value) {
return function () {
return value;
};
};
var never = constant(false);
var always = constant(true);
var none = function () {
return NONE;
};
var NONE = function () {
var eq = function (o) {
return o.isNone();
};
var call = function (thunk) {
return thunk();
};
var id = function (n) {
return n;
};
var me = {
fold: function (n, s) {
return n();
},
is: never,
isSome: never,
isNone: always,
getOr: id,
getOrThunk: call,
getOrDie: function (msg) {
throw new Error(msg || 'error: getOrDie called on none.');
},
getOrNull: constant(null),
getOrUndefined: constant(undefined),
or: id,
orThunk: call,
map: none,
each: noop,
bind: none,
exists: never,
forall: always,
filter: none,
equals: eq,
equals_: eq,
toArray: function () {
return [];
},
toString: constant('none()')
};
if (Object.freeze) {
Object.freeze(me);
}
return me;
}();
var some = function (a) {
var constant_a = constant(a);
var self = function () {
return me;
};
var bind = function (f) {
return f(a);
};
var me = {
fold: function (n, s) {
return s(a);
},
is: function (v) {
return a === v;
},
isSome: always,
isNone: never,
getOr: constant_a,
getOrThunk: constant_a,
getOrDie: constant_a,
getOrNull: constant_a,
getOrUndefined: constant_a,
or: self,
orThunk: self,
map: function (f) {
return some(f(a));
},
each: function (f) {
f(a);
},
bind: bind,
exists: bind,
forall: bind,
filter: function (f) {
return f(a) ? me : NONE;
},
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;
};
var from = function (value) {
return value === null || value === undefined ? NONE : some(value);
};
var Option = {
some: some,
none: none,
from: from
};
var hasOwnProperty = Object.hasOwnProperty;
var get = function (obj, key) {
return has(obj, key) ? Option.from(obj[key]) : Option.none();
};
var has = function (obj, key) {
return hasOwnProperty.call(obj, key);
};
var global$3 = tinymce.util.Tools.resolve('tinymce.dom.DOMUtils');
var global$4 = tinymce.util.Tools.resolve('tinymce.html.SaxParser');
var getVideoScriptMatch = function (prefixes, src) {
if (prefixes) {
@ -62,76 +207,65 @@ var media = (function () {
};
var VideoScript = { getVideoScriptMatch: getVideoScriptMatch };
var DOM = global$3.DOM;
var trimPx = function (value) {
return value.replace(/px$/, '');
};
var addPx = function (value) {
return /^[0-9.]+$/.test(value) ? value + 'px' : value;
};
var getSize = function (name) {
return function (elm) {
return elm ? trimPx(elm.style[name]) : '';
var getEphoxEmbedData = function (attrs) {
var style = attrs.map.style;
var styles = style ? DOM.parseStyle(style) : {};
return {
type: 'ephox-embed-iri',
source1: attrs.map['data-ephox-embed-iri'],
source2: '',
poster: '',
width: get(styles, 'max-width').map(trimPx).getOr(''),
height: get(styles, 'max-height').map(trimPx).getOr('')
};
};
var setSize = function (name) {
return function (elm, value) {
if (elm) {
elm.style[name] = addPx(value);
}
};
};
var Size = {
getMaxWidth: getSize('maxWidth'),
getMaxHeight: getSize('maxHeight'),
setMaxWidth: setSize('maxWidth'),
setMaxHeight: setSize('maxHeight')
};
var DOM = global$4.DOM;
var getEphoxEmbedIri = function (elm) {
return DOM.getAttrib(elm, 'data-ephox-embed-iri');
};
var isEphoxEmbed = function (html) {
var fragment = DOM.createFragment(html);
return getEphoxEmbedIri(fragment.firstChild) !== '';
};
var htmlToDataSax = function (prefixes, html) {
var htmlToData = function (prefixes, html) {
var isEphoxEmbed = Cell(false);
var data = {};
global$3({
global$4({
validate: false,
allow_conditional_comments: true,
special: 'script,noscript',
start: function (name, attrs) {
if (!data.source1 && name === 'param') {
data.source1 = attrs.map.movie;
}
if (name === 'iframe' || name === 'object' || name === 'embed' || name === 'video' || name === 'audio') {
if (!data.type) {
data.type = name;
if (isEphoxEmbed.get()) ; else if (has(attrs.map, 'data-ephox-embed-iri')) {
isEphoxEmbed.set(true);
data = getEphoxEmbedData(attrs);
} else {
if (!data.source1 && name === 'param') {
data.source1 = attrs.map.movie;
}
data = global$2.extend(attrs.map, data);
}
if (name === 'script') {
var videoScript = VideoScript.getVideoScriptMatch(prefixes, attrs.map.src);
if (!videoScript) {
return;
if (name === 'iframe' || name === 'object' || name === 'embed' || name === 'video' || name === 'audio') {
if (!data.type) {
data.type = name;
}
data = global$2.extend(attrs.map, data);
}
data = {
type: 'script',
source1: attrs.map.src,
width: videoScript.width,
height: videoScript.height
};
}
if (name === 'source') {
if (!data.source1) {
data.source1 = attrs.map.src;
} else if (!data.source2) {
data.source2 = attrs.map.src;
if (name === 'script') {
var videoScript = VideoScript.getVideoScriptMatch(prefixes, attrs.map.src);
if (!videoScript) {
return;
}
data = {
type: 'script',
source1: attrs.map.src,
width: videoScript.width,
height: videoScript.height
};
}
if (name === 'source') {
if (!data.source1) {
data.source1 = attrs.map.src;
} else if (!data.source2) {
data.source2 = attrs.map.src;
}
}
if (name === 'img' && !data.poster) {
data.poster = attrs.map.src;
}
}
if (name === 'img' && !data.poster) {
data.poster = attrs.map.src;
}
}
}).parse(html);
@ -140,21 +274,6 @@ var media = (function () {
data.poster = data.poster || '';
return data;
};
var ephoxEmbedHtmlToData = function (html) {
var fragment = DOM.createFragment(html);
var div = fragment.firstChild;
return {
type: 'ephox-embed-iri',
source1: getEphoxEmbedIri(div),
source2: '',
poster: '',
width: Size.getMaxWidth(div),
height: Size.getMaxHeight(div)
};
};
var htmlToData = function (prefixes, html) {
return isEphoxEmbed(html) ? ephoxEmbedHtmlToData(html) : htmlToDataSax(prefixes, html);
};
var HtmlToData = { htmlToData: htmlToData };
var global$5 = tinymce.util.Tools.resolve('tinymce.util.Promise');
@ -174,22 +293,21 @@ var media = (function () {
};
var Mime = { guess: guess };
var global$6 = tinymce.util.Tools.resolve('tinymce.html.Writer');
var global$6 = tinymce.util.Tools.resolve('tinymce.html.Schema');
var global$7 = tinymce.util.Tools.resolve('tinymce.html.Schema');
var global$7 = tinymce.util.Tools.resolve('tinymce.html.Writer');
var DOM$1 = global$4.DOM;
var DOM$1 = global$3.DOM;
var addPx = function (value) {
return /^[0-9.]+$/.test(value) ? value + 'px' : value;
};
var setAttributes = function (attrs, updatedAttrs) {
var name;
var i;
var value;
var attr;
for (name in updatedAttrs) {
value = '' + updatedAttrs[name];
for (var name in updatedAttrs) {
var value = '' + updatedAttrs[name];
if (attrs.map[name]) {
i = attrs.length;
var i = attrs.length;
while (i--) {
attr = attrs[i];
var attr = attrs[i];
if (attr.name === name) {
if (value) {
attrs.map[name] = value;
@ -209,17 +327,19 @@ var media = (function () {
}
}
};
var normalizeHtml = function (html) {
var writer = global$6();
var parser = global$3(writer);
parser.parse(html);
return writer.getContent();
var updateEphoxEmbed = function (data, attrs) {
var style = attrs.map.style;
var styleMap = style ? DOM$1.parseStyle(style) : {};
styleMap['max-width'] = addPx(data.width);
styleMap['max-height'] = addPx(data.height);
setAttributes(attrs, { style: DOM$1.serializeStyle(styleMap) });
};
var updateHtmlSax = function (html, data, updateAll) {
var writer = global$6();
var updateHtml = function (html, data, updateAll) {
var writer = global$7();
var isEphoxEmbed = Cell(false);
var sourceCount = 0;
var hasImage;
global$3({
global$4({
validate: false,
allow_conditional_comments: true,
special: 'script,noscript',
@ -233,101 +353,94 @@ var media = (function () {
writer.text(text, raw);
},
start: function (name, attrs, empty) {
switch (name) {
case 'video':
case 'object':
case 'embed':
case 'img':
case 'iframe':
if (data.height !== undefined && data.width !== undefined) {
setAttributes(attrs, {
width: data.width,
height: data.height
});
}
break;
}
if (updateAll) {
if (isEphoxEmbed.get()) ; else if (has(attrs.map, 'data-ephox-embed-iri')) {
isEphoxEmbed.set(true);
updateEphoxEmbed(data, attrs);
} else {
switch (name) {
case 'video':
setAttributes(attrs, {
poster: data.poster,
src: ''
});
if (data.source2) {
setAttributes(attrs, { src: '' });
case 'object':
case 'embed':
case 'img':
case 'iframe':
if (data.height !== undefined && data.width !== undefined) {
setAttributes(attrs, {
width: data.width,
height: data.height
});
}
break;
case 'iframe':
setAttributes(attrs, { src: data.source1 });
break;
case 'source':
sourceCount++;
if (sourceCount <= 2) {
}
if (updateAll) {
switch (name) {
case 'video':
setAttributes(attrs, {
src: data['source' + sourceCount],
type: data['source' + sourceCount + 'mime']
poster: data.poster,
src: ''
});
if (!data['source' + sourceCount]) {
if (data.source2) {
setAttributes(attrs, { src: '' });
}
break;
case 'iframe':
setAttributes(attrs, { src: data.source1 });
break;
case 'source':
sourceCount++;
if (sourceCount <= 2) {
setAttributes(attrs, {
src: data['source' + sourceCount],
type: data['source' + sourceCount + 'mime']
});
if (!data['source' + sourceCount]) {
return;
}
}
break;
case 'img':
if (!data.poster) {
return;
}
hasImage = true;
break;
}
break;
case 'img':
if (!data.poster) {
return;
}
hasImage = true;
break;
}
}
writer.start(name, attrs, empty);
},
end: function (name) {
if (name === 'video' && updateAll) {
for (var index = 1; index <= 2; index++) {
if (data['source' + index]) {
var attrs = [];
attrs.map = {};
if (sourceCount < index) {
setAttributes(attrs, {
src: data['source' + index],
type: data['source' + index + 'mime']
});
writer.start('source', attrs, true);
if (!isEphoxEmbed.get()) {
if (name === 'video' && updateAll) {
for (var index = 1; index <= 2; index++) {
if (data['source' + index]) {
var attrs = [];
attrs.map = {};
if (sourceCount < index) {
setAttributes(attrs, {
src: data['source' + index],
type: data['source' + index + 'mime']
});
writer.start('source', attrs, true);
}
}
}
}
}
if (data.poster && name === 'object' && updateAll && !hasImage) {
var imgAttrs = [];
imgAttrs.map = {};
setAttributes(imgAttrs, {
src: data.poster,
width: data.width,
height: data.height
});
writer.start('img', imgAttrs, true);
if (data.poster && name === 'object' && updateAll && !hasImage) {
var imgAttrs = [];
imgAttrs.map = {};
setAttributes(imgAttrs, {
src: data.poster,
width: data.width,
height: data.height
});
writer.start('img', imgAttrs, true);
}
}
writer.end(name);
}
}, global$7({})).parse(html);
}, global$6({})).parse(html);
return writer.getContent();
};
var isEphoxEmbed$1 = function (html) {
var fragment = DOM$1.createFragment(html);
return DOM$1.getAttrib(fragment.firstChild, 'data-ephox-embed-iri') !== '';
};
var updateEphoxEmbed = function (html, data) {
var fragment = DOM$1.createFragment(html);
var div = fragment.firstChild;
Size.setMaxWidth(div, data.width);
Size.setMaxHeight(div, data.height);
return normalizeHtml(div.outerHTML);
};
var updateHtml = function (html, data, updateAll) {
return isEphoxEmbed$1(html) ? updateEphoxEmbed(html, data) : updateHtmlSax(html, data, updateAll);
};
var UpdateHtml = { updateHtml: updateHtml };
var urlPatterns = [
@ -551,6 +664,31 @@ var media = (function () {
isCached: isCached
};
var trimPx$1 = function (value) {
return value.replace(/px$/, '');
};
var addPx$1 = function (value) {
return /^[0-9.]+$/.test(value) ? value + 'px' : value;
};
var getSize = function (name) {
return function (elm) {
return elm ? trimPx$1(elm.style[name]) : '';
};
};
var setSize = function (name) {
return function (elm, value) {
if (elm) {
elm.style[name] = addPx$1(value);
}
};
};
var Size = {
getMaxWidth: getSize('maxWidth'),
getMaxHeight: getSize('maxHeight'),
setMaxWidth: setSize('maxWidth'),
setMaxHeight: setSize('maxHeight')
};
var doSyncSize = function (widthCtrl, heightCtrl) {
widthCtrl.state.set('oldVal', widthCtrl.value());
heightCtrl.state.set('oldVal', heightCtrl.value());
@ -825,13 +963,13 @@ var media = (function () {
};
var Dialog = { showDialog: showDialog };
var get = function (editor) {
var get$1 = function (editor) {
var showDialog = function () {
Dialog.showDialog(editor);
};
return { showDialog: showDialog };
};
var Api = { get: get };
var Api = { get: get$1 };
var register = function (editor) {
var showDialog = function () {
@ -847,9 +985,9 @@ var media = (function () {
if (Settings.shouldFilterHtml(editor) === false) {
return html;
}
var writer = global$6();
var writer = global$7();
var blocked;
global$3({
global$4({
validate: false,
allow_conditional_comments: false,
special: 'script,noscript',
@ -864,14 +1002,16 @@ var media = (function () {
},
start: function (name, attrs, empty) {
blocked = true;
if (name === 'script' || name === 'noscript') {
if (name === 'script' || name === 'noscript' || name === 'svg') {
return;
}
for (var i = 0; i < attrs.length; i++) {
if (attrs[i].name.indexOf('on') === 0) {
return;
for (var i = attrs.length - 1; i >= 0; i--) {
var attrName = attrs[i].name;
if (attrName.indexOf('on') === 0) {
delete attrs.map[attrName];
attrs.splice(i, 1);
}
if (attrs[i].name === 'style') {
if (attrName === 'style') {
attrs[i].value = editor.dom.serializeStyle(editor.dom.parseStyle(attrs[i].value), name);
}
}
@ -884,7 +1024,7 @@ var media = (function () {
}
writer.end(name);
}
}, global$7({})).parse(html);
}, global$6({})).parse(html);
return writer.getContent();
};
var Sanitize = { sanitize: sanitize };

File diff suppressed because one or more lines are too long

View File

@ -249,11 +249,11 @@ var paste = (function (domGlobals) {
var global$7 = tinymce.util.Tools.resolve('tinymce.html.DomParser');
var global$8 = tinymce.util.Tools.resolve('tinymce.html.Node');
var global$8 = tinymce.util.Tools.resolve('tinymce.html.Serializer');
var global$9 = tinymce.util.Tools.resolve('tinymce.html.Schema');
var global$9 = tinymce.util.Tools.resolve('tinymce.html.Node');
var global$a = tinymce.util.Tools.resolve('tinymce.html.Serializer');
var global$a = tinymce.util.Tools.resolve('tinymce.html.Schema');
function filter(content, items) {
global$4.each(items, function (v) {
@ -266,7 +266,7 @@ var paste = (function (domGlobals) {
return content;
}
function innerText(html) {
var schema = global$9();
var schema = global$a();
var domParser = global$7({}, schema);
var text = '';
var shortEndedElements = schema.getShortEndedElements();
@ -426,7 +426,7 @@ var paste = (function (domGlobals) {
}
if (!currentListNode || currentListNode.name !== listName) {
prevListNode = prevListNode || currentListNode;
currentListNode = new global$8(listName, 1);
currentListNode = new global$9(listName, 1);
if (start > 1) {
currentListNode.attr('start', '' + start);
}
@ -538,11 +538,11 @@ var paste = (function (domGlobals) {
});
if (/(bold)/i.test(outputStyles['font-weight'])) {
delete outputStyles['font-weight'];
node.wrap(new global$8('b', 1));
node.wrap(new global$9('b', 1));
}
if (/(italic)/i.test(outputStyles['font-style'])) {
delete outputStyles['font-style'];
node.wrap(new global$8('i', 1));
node.wrap(new global$9('i', 1));
}
outputStyles = editor.dom.serializeStyle(outputStyles, node.name);
if (outputStyles) {
@ -577,7 +577,7 @@ var paste = (function (domGlobals) {
]
]);
var validElements = Settings.getWordValidElements(editor);
var schema = global$9({
var schema = global$a({
valid_elements: validElements,
valid_children: '-li[p]'
});
@ -653,7 +653,7 @@ var paste = (function (domGlobals) {
if (Settings.shouldConvertWordFakeLists(editor)) {
convertFakeListsToProperLists(rootNode);
}
content = global$a({ validate: editor.settings.validate }, schema).serialize(rootNode);
content = global$8({ validate: editor.settings.validate }, schema).serialize(rootNode);
return content;
};
var preProcess = function (editor, content) {
@ -664,6 +664,19 @@ var paste = (function (domGlobals) {
isWordContent: isWordContent
};
var preProcess$1 = function (editor, html) {
var parser = global$7({}, editor.schema);
parser.addNodeFilter('meta', function (nodes) {
global$4.each(nodes, function (node) {
return node.remove();
});
});
var fragment = parser.parse(html, {
forced_root_block: false,
isRootContent: true
});
return global$8({ validate: editor.settings.validate }, editor.schema).serialize(fragment);
};
var processResult = function (content, cancelled) {
return {
content: content,
@ -677,10 +690,11 @@ var paste = (function (domGlobals) {
};
var filterContent = function (editor, content, internal, isWordHtml) {
var preProcessArgs = Events.firePastePreProcess(editor, content, internal, isWordHtml);
var filteredContent = preProcess$1(editor, preProcessArgs.content);
if (editor.hasEventListeners('PastePostProcess') && !preProcessArgs.isDefaultPrevented()) {
return postProcessFilter(editor, preProcessArgs.content, internal, isWordHtml);
return postProcessFilter(editor, filteredContent, internal, isWordHtml);
} else {
return processResult(preProcessArgs.content, preProcessArgs.isDefaultPrevented());
return processResult(filteredContent, preProcessArgs.isDefaultPrevented());
}
};
var process = function (editor, html, internal) {
@ -690,15 +704,8 @@ var paste = (function (domGlobals) {
};
var ProcessFilters = { process: process };
var removeMeta = function (editor, html) {
var body = editor.dom.create('body', {}, html);
global$4.each(body.querySelectorAll('meta'), function (elm) {
return elm.parentNode.removeChild(elm);
});
return body.innerHTML;
};
var pasteHtml = function (editor, html) {
editor.insertContent(removeMeta(editor, html), {
editor.insertContent(html, {
merge: Settings.shouldMergeFormats(editor),
paste: true
});
@ -754,6 +761,8 @@ var paste = (function (domGlobals) {
insertContent: insertContent
};
var noop = function () {
};
var constant = function (value) {
return function () {
return value;
@ -776,8 +785,6 @@ var paste = (function (domGlobals) {
var never = constant(false);
var always = constant(true);
var never$1 = never;
var always$1 = always;
var none = function () {
return NONE;
};
@ -791,37 +798,27 @@ var paste = (function (domGlobals) {
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,
@ -836,15 +833,10 @@ var paste = (function (domGlobals) {
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);
};
@ -855,8 +847,8 @@ var paste = (function (domGlobals) {
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,
@ -864,35 +856,31 @@ var paste = (function (domGlobals) {
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;
@ -926,34 +914,34 @@ var paste = (function (domGlobals) {
};
var isFunction = isType('function');
var slice = Array.prototype.slice;
var nativeSlice = Array.prototype.slice;
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$1 = 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);
}
}
return r;
};
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
return slice.call(x);
return nativeSlice.call(x);
};
var exports$1 = {}, module = { exports: exports$1 };
@ -1597,10 +1585,10 @@ var paste = (function (domGlobals) {
var par$1 = function (futures) {
return par(futures, Future.nu);
};
var mapM = function (array, fn) {
var futures = map(array, fn);
return par$1(futures);
var traverse = function (array, fn) {
return par$1(map(array, fn));
};
var mapM = traverse;
var value = function () {
var subject = Cell(Option.none());
@ -2045,7 +2033,7 @@ var paste = (function (domGlobals) {
};
};
var noop = function () {
var noop$1 = function () {
};
var hasWorkingClipboardApi = function (clipboardData) {
return global$2.iOS === false && clipboardData !== undefined && typeof clipboardData.setData === 'function' && Utils.isMsEdge() !== true;
@ -2128,7 +2116,7 @@ var paste = (function (domGlobals) {
var copy = function (editor) {
return function (evt) {
if (hasSelectedContent(editor)) {
setClipboardData(evt, getData(editor), fallback(editor), noop);
setClipboardData(evt, getData(editor), fallback(editor), noop$1);
}
};
};

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
.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 rgba(208,2,27,0.5);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:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}.mce-content-body{line-height:1.3}
.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 rgba(208,2,27,0.5);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:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}.mce-content-body{line-height:1.3}

View File

@ -1 +1 @@
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 rgba(208,2,27,0.5);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:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}
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 rgba(208,2,27,0.5);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:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}

View File

@ -560,8 +560,6 @@ var inlite = (function (domGlobals) {
var never = constant(false);
var always = constant(true);
var never$1 = never;
var always$1 = always;
var none = function () {
return NONE;
};
@ -575,37 +573,27 @@ var inlite = (function (domGlobals) {
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,
@ -620,15 +608,10 @@ var inlite = (function (domGlobals) {
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);
};
@ -639,8 +622,8 @@ var inlite = (function (domGlobals) {
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,
@ -648,35 +631,31 @@ var inlite = (function (domGlobals) {
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;
@ -712,44 +691,45 @@ var inlite = (function (domGlobals) {
var isFunction$1 = isType$1('function');
var isNumber$1 = isType$1('number');
var slice = Array.prototype.slice;
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);
}
}
@ -764,42 +744,24 @@ var inlite = (function (domGlobals) {
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);
}
}
return Option.none();
};
var findIndex = function (xs, pred) {
for (var i = 0, len = xs.length; i < len; i++) {
var x = xs[i];
if (pred(x, i, xs)) {
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$1 = function (xs) {
var r = [];
for (var i = 0, len = xs.length; i < len; ++i) {
if (!isArray$1(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 from$1 = isFunction$1(Array.from) ? Array.from : function (x) {
return slice.call(x);
return nativeSlice.call(x);
};
var count = 0;
@ -1231,7 +1193,7 @@ var inlite = (function (domGlobals) {
});
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) {
@ -1245,10 +1207,10 @@ var inlite = (function (domGlobals) {
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;
},
@ -1285,7 +1247,7 @@ var inlite = (function (domGlobals) {
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);
@ -7837,11 +7799,11 @@ var inlite = (function (domGlobals) {
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(menuItem) || !isSeparator(menuItems[i - 1]);
});
return filter(menuItems2, function (menuItem, i, menuItems) {
return !isSeparator(menuItem) || i > 0 && i < menuItems.length - 1;
return filter(menuItems2, function (menuItem, i) {
return !isSeparator(menuItem) || i > 0 && i < menuItems2.length - 1;
});
};
var createContextMenuItems = function (editor, context) {

File diff suppressed because one or more lines are too long

View File

@ -159,8 +159,6 @@ var modern = (function (domGlobals) {
var never = constant(false);
var always = constant(true);
var never$1 = never;
var always$1 = always;
var none = function () {
return NONE;
};
@ -174,37 +172,27 @@ var modern = (function (domGlobals) {
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,
@ -219,15 +207,10 @@ var modern = (function (domGlobals) {
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);
};
@ -238,8 +221,8 @@ var modern = (function (domGlobals) {
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,
@ -247,35 +230,31 @@ var modern = (function (domGlobals) {
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;
@ -685,44 +664,45 @@ var modern = (function (domGlobals) {
var isFunction = isType('function');
var isNumber = isType('number');
var slice = Array.prototype.slice;
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);
}
}
@ -737,7 +717,7 @@ var modern = (function (domGlobals) {
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);
}
}
@ -746,33 +726,24 @@ var modern = (function (domGlobals) {
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 (!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 from$1 = isFunction(Array.from) ? Array.from : function (x) {
return slice.call(x);
return nativeSlice.call(x);
};
var defaultMenus = {
@ -828,11 +799,11 @@ var modern = (function (domGlobals) {
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) {
@ -1771,7 +1742,7 @@ var modern = (function (domGlobals) {
});
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) {
@ -1785,10 +1756,10 @@ var modern = (function (domGlobals) {
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;
},
@ -1825,7 +1796,7 @@ var modern = (function (domGlobals) {
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);
@ -7679,11 +7650,11 @@ var modern = (function (domGlobals) {
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) {

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

View File

@ -27,7 +27,7 @@ $wp_db_version = 48121;
*
* @global string $tinymce_version
*/
$tinymce_version = '4960-20190918';
$tinymce_version = '49100-20200624';
/**
* Holds the required PHP version.