Skip to content

Commit

Permalink
2.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@tabuna
tabuna committed Sep 21, 2018
1 parent 0eda7b7 commit 5bfc281
Show file tree
Hide file tree
Showing 60 changed files with 5,280 additions and 5,157 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"bootstrap": "^4.0",
"bootstrap-tagsinput": "^0.7",
"brace": "^0.11.1",
"codemirror": "^5.35.0",
"codemirror": "^5.40.2",
"croppie": "^2.6.1",
"cross-env": "^5.1",
"dropzone": "^5.3",
Expand All @@ -27,16 +27,16 @@
"jquery-ui": "^1.12",
"jquery-ui-bundle": "^1.11",
"laravel-mix": "^2.0",
"lodash": "^4.17.5",
"lodash": "^4.17.11",
"moment": "^2.20",
"nestable": "^0.2",
"open-color": "^1.5",
"orchid-icons": "^1.0",
"orchid-icons": "^1.0.8",
"popper.js": "^1.13",
"select2": "^4.0",
"select2-bootstrap-theme": "0.1.0-beta.10",
"simplemde": "^1.11",
"tinymce": "^4.7.9",
"tinymce": "^4.8.3",
"turbolinks": "^5.1",
"vue": "^2.5"
}
Expand Down
7 changes: 7 additions & 0 deletions public/js/tinymce/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 4.8.3 (2018-09-13)
Fixed a bug where the Wordcount Plugin didn't correctly count words within tables on IE11. #TINY-1770
Fixed a bug where it wasn't possible to move the caret out of a table on IE11 and Firefox. #TINY-1682
Fixed a bug where merging empty blocks didn't work as expected, sometimes causing content to be deleted. #TINY-1781
Fixed a bug where the Textcolor Plugin didn't show the correct current color. #TINY-1810
Fixed a bug where clear formatting with a collapsed selection would sometimes clear formatting from more content than expected. #TINY-1813 #TINY-1821
Fixed a bug with the Table Plugin where it wasn't possible to keyboard navigate to the caption. #TINY-1818
Version 4.8.2 (2018-08-09)
Moved annotator from "experimental" to "annotator" object on editor. #TBS-2398
Improved the multiclick normalization across browsers. #TINY-1788
Expand Down
2 changes: 1 addition & 1 deletion public/js/tinymce/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinymce/tinymce",
"version": "4.8.2",
"version": "4.8.3",
"description": "Web based JavaScript HTML WYSIWYG editor control.",
"license": [
"LGPL-2.1-only"
Expand Down
25 changes: 13 additions & 12 deletions public/js/tinymce/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"_from": "tinymce@^4.7.9",
"_id": "[email protected].2",
"_from": "tinymce@4.8.3",
"_id": "[email protected].3",
"_inBundle": false,
"_integrity": "sha512-ssq/cGcK8ELG+a96H2mqH6QvsmTSlQk9wj+OYxLIOxsDnWfu90T1TGIachwcQnXsD5FeNFz5X7K860CP9JQCtQ==",
"_integrity": "sha512-kNEsKTqUYZRG+GTZ7tcVAktUlDeApz6d3IqnNaZXNX0CP0BsK8NPC02FCJ0EVYxdNnq6fvvknWkItmbreXD9aA==",
"_location": "/tinymce",
"_phantomChildren": {},
"_requested": {
"type": "range",
"type": "version",
"registry": true,
"raw": "tinymce@^4.7.9",
"raw": "tinymce@4.8.3",
"name": "tinymce",
"escapedName": "tinymce",
"rawSpec": "^4.7.9",
"rawSpec": "4.8.3",
"saveSpec": null,
"fetchSpec": "^4.7.9"
"fetchSpec": "4.8.3"
},
"_requiredBy": [
"#USER",
"/"
],
"_resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.8.2.tgz",
"_shasum": "2ba65ee56f6641d8dcaca85db3fb36e9b35a3010",
"_spec": "tinymce@^4.7.9",
"_where": "/home/tabuna/old/platform",
"_resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.8.3.tgz",
"_shasum": "fdfe92121a5431fc6e2f295346f781cd200db3b9",
"_spec": "tinymce@4.8.3",
"_where": "/home/tabuna/ORCHID/developer/platform",
"author": {
"name": "Ephox Corporation"
},
Expand All @@ -47,5 +48,5 @@
"type": "git",
"url": "git+https://github.com/tinymce/tinymce-dist.git"
},
"version": "4.8.2"
"version": "4.8.3"
}
34 changes: 17 additions & 17 deletions public/js/tinymce/plugins/advlist/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ var advlist = (function () {
var cmd = listName === 'UL' ? 'InsertUnorderedList' : 'InsertOrderedList';
editor.execCommand(cmd, false, styleValue === false ? null : { 'list-style-type': styleValue });
};
var $_55fky08fjkmcwo2a = { applyListFormat: applyListFormat };
var $_1wa7xb8ejm0ofy0b = { applyListFormat: applyListFormat };

var register = function (editor) {
editor.addCommand('ApplyUnorderedListStyle', function (ui, value) {
$_55fky08fjkmcwo2a.applyListFormat(editor, 'UL', value['list-style-type']);
$_1wa7xb8ejm0ofy0b.applyListFormat(editor, 'UL', value['list-style-type']);
});
editor.addCommand('ApplyOrderedListStyle', function (ui, value) {
$_55fky08fjkmcwo2a.applyListFormat(editor, 'OL', value['list-style-type']);
$_1wa7xb8ejm0ofy0b.applyListFormat(editor, 'OL', value['list-style-type']);
});
};
var $_cjqqqe8ejkmcwo28 = { register: register };
var $_deo70y8djm0ofy0a = { register: register };

var getNumberStyles = function (editor) {
var styles = editor.getParam('advlist_number_styles', 'default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman');
Expand All @@ -30,7 +30,7 @@ var advlist = (function () {
var styles = editor.getParam('advlist_bullet_styles', 'default,circle,disc,square');
return styles ? styles.split(/[ ,]/) : [];
};
var $_2zo4iv8hjkmcwo2f = {
var $_5vpf7p8gjm0ofy0p = {
getNumberStyles: getNumberStyles,
getBulletStyles: getBulletStyles
};
Expand All @@ -50,7 +50,7 @@ var advlist = (function () {
var listElm = editor.dom.getParent(editor.selection.getNode(), 'ol,ul');
return editor.dom.getStyle(listElm, 'listStyleType') || '';
};
var $_djj0lo8ijkmcwo2g = {
var $_a5btxi8hjm0ofy0r = {
isTableCellNode: isTableCellNode,
isListNode: isListNode,
getSelectedStyleType: getSelectedStyleType
Expand All @@ -71,7 +71,7 @@ var advlist = (function () {
};
});
};
var $_cbyrf58jjkmcwo2h = { toMenuItems: toMenuItems };
var $_eshxnq8ijm0ofy0s = { toMenuItems: toMenuItems };

var findIndex = function (list, predicate) {
for (var index = 0; index < list.length; index++) {
Expand All @@ -86,16 +86,16 @@ var advlist = (function () {
return function (e) {
var ctrl = e.control;
editor.on('NodeChange', function (e) {
var tableCellIndex = findIndex(e.parents, $_djj0lo8ijkmcwo2g.isTableCellNode);
var tableCellIndex = findIndex(e.parents, $_a5btxi8hjm0ofy0r.isTableCellNode);
var parents = tableCellIndex !== -1 ? e.parents.slice(0, tableCellIndex) : e.parents;
var lists = global$1.grep(parents, $_djj0lo8ijkmcwo2g.isListNode(editor));
var lists = global$1.grep(parents, $_a5btxi8hjm0ofy0r.isListNode(editor));
ctrl.active(lists.length > 0 && lists[0].nodeName === listName);
});
};
};
var updateSelection = function (editor) {
return function (e) {
var listStyleType = $_djj0lo8ijkmcwo2g.getSelectedStyleType(editor);
var listStyleType = $_a5btxi8hjm0ofy0r.getSelectedStyleType(editor);
e.control.items().each(function (ctrl) {
ctrl.active(ctrl.settings.data === listStyleType);
});
Expand All @@ -106,11 +106,11 @@ var advlist = (function () {
active: false,
type: 'splitbutton',
tooltip: tooltip,
menu: $_cbyrf58jjkmcwo2h.toMenuItems(styles),
menu: $_eshxnq8ijm0ofy0s.toMenuItems(styles),
onPostRender: listState(editor, nodeName),
onshow: updateSelection(editor),
onselect: function (e) {
$_55fky08fjkmcwo2a.applyListFormat(editor, nodeName, e.control.settings.data);
$_1wa7xb8ejm0ofy0b.applyListFormat(editor, nodeName, e.control.settings.data);
},
onclick: function () {
editor.execCommand(cmd);
Expand All @@ -136,19 +136,19 @@ var advlist = (function () {
}
};
var register$1 = function (editor) {
addControl(editor, 'numlist', 'Numbered list', 'InsertOrderedList', 'OL', $_2zo4iv8hjkmcwo2f.getNumberStyles(editor));
addControl(editor, 'bullist', 'Bullet list', 'InsertUnorderedList', 'UL', $_2zo4iv8hjkmcwo2f.getBulletStyles(editor));
addControl(editor, 'numlist', 'Numbered list', 'InsertOrderedList', 'OL', $_5vpf7p8gjm0ofy0p.getNumberStyles(editor));
addControl(editor, 'bullist', 'Bullet list', 'InsertUnorderedList', 'UL', $_5vpf7p8gjm0ofy0p.getBulletStyles(editor));
};
var $_d74fz58gjkmcwo2b = { register: register$1 };
var $_zf7p98fjm0ofy0c = { register: register$1 };

global.add('advlist', function (editor) {
var hasPlugin = function (editor, plugin) {
var plugins = editor.settings.plugins ? editor.settings.plugins : '';
return global$1.inArray(plugins.split(/[ ,]/), plugin) !== -1;
};
if (hasPlugin(editor, 'lists')) {
$_d74fz58gjkmcwo2b.register(editor);
$_cjqqqe8ejkmcwo28.register(editor);
$_zf7p98fjm0ofy0c.register(editor);
$_deo70y8djm0ofy0a.register(editor);
}
});
function Plugin () {
Expand Down
24 changes: 12 additions & 12 deletions public/js/tinymce/plugins/anchor/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ var anchor = (function () {
editor.execCommand('mceInsertContent', false, editor.dom.createHTML('a', { id: id }));
}
};
var $_diakhu8ojkmcwo32 = {
var $_2nc5az8njm0ofy1c = {
isValidId: isValidId,
getId: getId,
insert: insert
};

var insertAnchor = function (editor, newId) {
if (!$_diakhu8ojkmcwo32.isValidId(newId)) {
if (!$_2nc5az8njm0ofy1c.isValidId(newId)) {
editor.windowManager.alert('Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.');
return true;
} else {
$_diakhu8ojkmcwo32.insert(editor, newId);
$_2nc5az8njm0ofy1c.insert(editor, newId);
return false;
}
};
var open = function (editor) {
var currentId = $_diakhu8ojkmcwo32.getId(editor);
var currentId = $_2nc5az8njm0ofy1c.getId(editor);
editor.windowManager.open({
title: 'Anchor',
body: {
Expand All @@ -59,14 +59,14 @@ var anchor = (function () {
}
});
};
var $_3a31oa8njkmcwo30 = { open: open };
var $_am0ijo8mjm0ofy1a = { open: open };

var register = function (editor) {
editor.addCommand('mceAnchor', function () {
$_3a31oa8njkmcwo30.open(editor);
$_am0ijo8mjm0ofy1a.open(editor);
});
};
var $_531sc78mjkmcwo2z = { register: register };
var $_e6qpab8ljm0ofy19 = { register: register };

var isAnchorNode = function (node) {
return !node.attr('href') && (node.attr('id') || node.attr('name')) && !node.firstChild;
Expand All @@ -86,7 +86,7 @@ var anchor = (function () {
editor.serializer.addNodeFilter('a', setContentEditable(null));
});
};
var $_6ryayv8pjkmcwo33 = { setup: setup };
var $_8e6j2x8ojm0ofy1e = { setup: setup };

var register$1 = function (editor) {
editor.addButton('anchor', {
Expand All @@ -102,12 +102,12 @@ var anchor = (function () {
cmd: 'mceAnchor'
});
};
var $_4xjg5w8qjkmcwo35 = { register: register$1 };
var $_5e36o08pjm0ofy1f = { register: register$1 };

global.add('anchor', function (editor) {
$_6ryayv8pjkmcwo33.setup(editor);
$_531sc78mjkmcwo2z.register(editor);
$_4xjg5w8qjkmcwo35.register(editor);
$_8e6j2x8ojm0ofy1e.setup(editor);
$_e6qpab8ljm0ofy19.register(editor);
$_5e36o08pjm0ofy1f.register(editor);
});
function Plugin () {
}
Expand Down
10 changes: 5 additions & 5 deletions public/js/tinymce/plugins/autolink/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var autolink = (function () {
var getDefaultLinkTarget = function (editor) {
return editor.getParam('default_link_target', '');
};
var $_etr1bi8vjkmcwo3m = {
var $_8qi3az8ujm0ofy1y = {
getAutoLinkPattern: getAutoLinkPattern,
getDefaultLinkTarget: getDefaultLinkTarget
};
Expand Down Expand Up @@ -57,8 +57,8 @@ var autolink = (function () {
};
var parseCurrentLine = function (editor, endOffset, delimiter) {
var rng, end, start, endContainer, bookmark, text, matches, prev, len, rngText;
var autoLinkPattern = $_etr1bi8vjkmcwo3m.getAutoLinkPattern(editor);
var defaultLinkTarget = $_etr1bi8vjkmcwo3m.getDefaultLinkTarget(editor);
var autoLinkPattern = $_8qi3az8ujm0ofy1y.getAutoLinkPattern(editor);
var defaultLinkTarget = $_8qi3az8ujm0ofy1y.getDefaultLinkTarget(editor);
if (editor.selection.getNode().tagName === 'A') {
return;
}
Expand Down Expand Up @@ -166,10 +166,10 @@ var autolink = (function () {
}
});
};
var $_eivkp88tjkmcwo3h = { setup: setup };
var $_3z0w268sjm0ofy1t = { setup: setup };

global.add('autolink', function (editor) {
$_eivkp88tjkmcwo3h.setup(editor);
$_3z0w268sjm0ofy1t.setup(editor);
});
function Plugin () {
}
Expand Down
24 changes: 12 additions & 12 deletions public/js/tinymce/plugins/autoresize/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var autoresize = (function () {
var shouldAutoResizeOnInit = function (editor) {
return editor.getParam('autoresize_on_init', true);
};
var $_37zh3k93jkmcwo49 = {
var $_bfihac92jm0ofy2n = {
getAutoResizeMinHeight: getAutoResizeMinHeight,
getAutoResizeMaxHeight: getAutoResizeMaxHeight,
getAutoResizeOverflowPadding: getAutoResizeOverflowPadding,
Expand Down Expand Up @@ -84,7 +84,7 @@ var autoresize = (function () {
return;
}
body = doc.body;
resizeHeight = $_37zh3k93jkmcwo49.getAutoResizeMinHeight(editor);
resizeHeight = $_bfihac92jm0ofy2n.getAutoResizeMinHeight(editor);
marginTop = dom.getStyle(body, 'margin-top', true);
marginBottom = dom.getStyle(body, 'margin-bottom', true);
paddingTop = dom.getStyle(body, 'padding-top', true);
Expand All @@ -95,10 +95,10 @@ var autoresize = (function () {
if (isNaN(myHeight) || myHeight <= 0) {
myHeight = global$1.ie ? body.scrollHeight : global$1.webkit && body.clientHeight === 0 ? 0 : body.offsetHeight;
}
if (myHeight > $_37zh3k93jkmcwo49.getAutoResizeMinHeight(editor)) {
if (myHeight > $_bfihac92jm0ofy2n.getAutoResizeMinHeight(editor)) {
resizeHeight = myHeight;
}
var maxHeight = $_37zh3k93jkmcwo49.getAutoResizeMaxHeight(editor);
var maxHeight = $_bfihac92jm0ofy2n.getAutoResizeMaxHeight(editor);
if (maxHeight && myHeight > maxHeight) {
resizeHeight = maxHeight;
toggleScrolling(editor, true);
Expand All @@ -118,8 +118,8 @@ var autoresize = (function () {
editor.on('init', function () {
var overflowPadding, bottomMargin;
var dom = editor.dom;
overflowPadding = $_37zh3k93jkmcwo49.getAutoResizeOverflowPadding(editor);
bottomMargin = $_37zh3k93jkmcwo49.getAutoResizeBottomMargin(editor);
overflowPadding = $_bfihac92jm0ofy2n.getAutoResizeOverflowPadding(editor);
bottomMargin = $_bfihac92jm0ofy2n.getAutoResizeBottomMargin(editor);
if (overflowPadding !== false) {
dom.setStyles(editor.getBody(), {
paddingLeft: overflowPadding,
Expand All @@ -133,31 +133,31 @@ var autoresize = (function () {
editor.on('nodechange setcontent keyup FullscreenStateChanged', function (e) {
resize(editor, oldSize);
});
if ($_37zh3k93jkmcwo49.shouldAutoResizeOnInit(editor)) {
if ($_bfihac92jm0ofy2n.shouldAutoResizeOnInit(editor)) {
editor.on('init', function () {
wait(editor, oldSize, 20, 100, function () {
wait(editor, oldSize, 5, 1000);
});
});
}
};
var $_5bbetq90jkmcwo45 = {
var $_uokf68zjm0ofy2j = {
setup: setup,
resize: resize
};

var register = function (editor, oldSize) {
editor.addCommand('mceAutoResize', function () {
$_5bbetq90jkmcwo45.resize(editor, oldSize);
$_uokf68zjm0ofy2j.resize(editor, oldSize);
});
};
var $_86jjbn8zjkmcwo43 = { register: register };
var $_36wr2x8yjm0ofy2h = { register: register };

global.add('autoresize', function (editor) {
if (!editor.inline) {
var oldSize = Cell(0);
$_86jjbn8zjkmcwo43.register(editor, oldSize);
$_5bbetq90jkmcwo45.setup(editor, oldSize);
$_36wr2x8yjm0ofy2h.register(editor, oldSize);
$_uokf68zjm0ofy2j.setup(editor, oldSize);
}
});
function Plugin () {
Expand Down
Loading

0 comments on commit 5bfc281

Please sign in to comment.