Skip to content

Commit

Permalink
Version 4.8.0-mysw-4
Browse files Browse the repository at this point in the history 
Messed up merge, fixed creating multiple modal dropdowns
  • Loading branch information
@dotKev
dotKev committed Jul 3, 2018
1 parent b4a9f39 commit 9aa11d7
Show file tree
Hide file tree
Showing 53 changed files with 5,028 additions and 5,029 deletions.
3 changes: 3 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Version 4.8.0-mysw-4 (2018-07-03)
Messed up merge, fixed creating multiple modal dropdowns

Version 4.8.0-mysw-3 (2018-07-03)
Moved rimraf dependency so grunt prod and postinstall script would work

Expand Down
34 changes: 17 additions & 17 deletions 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 $_bpswr58fjj660zn5 = { applyListFormat: applyListFormat };
var $_dulckp8fjj68z3xr = { applyListFormat: applyListFormat };

var register = function (editor) {
editor.addCommand('ApplyUnorderedListStyle', function (ui, value) {
$_bpswr58fjj660zn5.applyListFormat(editor, 'UL', value['list-style-type']);
$_dulckp8fjj68z3xr.applyListFormat(editor, 'UL', value['list-style-type']);
});
editor.addCommand('ApplyOrderedListStyle', function (ui, value) {
$_bpswr58fjj660zn5.applyListFormat(editor, 'OL', value['list-style-type']);
$_dulckp8fjj68z3xr.applyListFormat(editor, 'OL', value['list-style-type']);
});
};
var $_44guuf8ejj660zn2 = { register: register };
var $_6nkmkj8ejj68z3xo = { 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 $_5wo7r48hjj660znd = {
var $_9vh83f8hjj68z3xz = {
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 $_9tkiha8ijj660znf = {
var $_bojlj78ijj68z3y3 = {
isTableCellNode: isTableCellNode,
isListNode: isListNode,
getSelectedStyleType: getSelectedStyleType
Expand All @@ -71,7 +71,7 @@ var advlist = (function () {
};
});
};
var $_5yevsb8jjj660znh = { toMenuItems: toMenuItems };
var $_f9byqn8jjj68z3y6 = { 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, $_9tkiha8ijj660znf.isTableCellNode);
var tableCellIndex = findIndex(e.parents, $_bojlj78ijj68z3y3.isTableCellNode);
var parents = tableCellIndex !== -1 ? e.parents.slice(0, tableCellIndex) : e.parents;
var lists = global$1.grep(parents, $_9tkiha8ijj660znf.isListNode(editor));
var lists = global$1.grep(parents, $_bojlj78ijj68z3y3.isListNode(editor));
ctrl.active(lists.length > 0 && lists[0].nodeName === listName);
});
};
};
var updateSelection = function (editor) {
return function (e) {
var listStyleType = $_9tkiha8ijj660znf.getSelectedStyleType(editor);
var listStyleType = $_bojlj78ijj68z3y3.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: $_5yevsb8jjj660znh.toMenuItems(styles),
menu: $_f9byqn8jjj68z3y6.toMenuItems(styles),
onPostRender: listState(editor, nodeName),
onshow: updateSelection(editor),
onselect: function (e) {
$_bpswr58fjj660zn5.applyListFormat(editor, nodeName, e.control.settings.data);
$_dulckp8fjj68z3xr.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', $_5wo7r48hjj660znd.getNumberStyles(editor));
addControl(editor, 'bullist', 'Bullet list', 'InsertUnorderedList', 'UL', $_5wo7r48hjj660znd.getBulletStyles(editor));
addControl(editor, 'numlist', 'Numbered list', 'InsertOrderedList', 'OL', $_9vh83f8hjj68z3xz.getNumberStyles(editor));
addControl(editor, 'bullist', 'Bullet list', 'InsertUnorderedList', 'UL', $_9vh83f8hjj68z3xz.getBulletStyles(editor));
};
var $_fzy22h8gjj660zn7 = { register: register$1 };
var $_bqmi5p8gjj68z3xt = { 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')) {
$_fzy22h8gjj660zn7.register(editor);
$_44guuf8ejj660zn2.register(editor);
$_bqmi5p8gjj68z3xt.register(editor);
$_6nkmkj8ejj68z3xo.register(editor);
}
});
function Plugin () {
Expand Down
24 changes: 12 additions & 12 deletions 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 $_a8p71k8ojj660zo6 = {
var $_ahkx5g8ojj68z3zj = {
isValidId: isValidId,
getId: getId,
insert: insert
};

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

var register = function (editor) {
editor.addCommand('mceAnchor', function () {
$_dho2yt8njj660zo3.open(editor);
$_9qmmj78njj68z3ze.open(editor);
});
};
var $_cvfs9y8mjj660zo1 = { register: register };
var $_eg7icc8mjj68z3zb = { 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 $_8bgzut8pjj660zo9 = { setup: setup };
var $_3nf1sq8pjj68z3zm = { setup: setup };

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

global.add('anchor', function (editor) {
$_8bgzut8pjj660zo9.setup(editor);
$_cvfs9y8mjj660zo1.register(editor);
$_boif7w8qjj660zob.register(editor);
$_3nf1sq8pjj68z3zm.setup(editor);
$_eg7icc8mjj68z3zb.register(editor);
$_3jqyg38qjj68z3zq.register(editor);
});
function Plugin () {
}
Expand Down
10 changes: 5 additions & 5 deletions 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 $_bqs5em8vjj660zp2 = {
var $_e8kbi68vjj68z40o = {
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 = $_bqs5em8vjj660zp2.getAutoLinkPattern(editor);
var defaultLinkTarget = $_bqs5em8vjj660zp2.getDefaultLinkTarget(editor);
var autoLinkPattern = $_e8kbi68vjj68z40o.getAutoLinkPattern(editor);
var defaultLinkTarget = $_e8kbi68vjj68z40o.getDefaultLinkTarget(editor);
if (editor.selection.getNode().tagName === 'A') {
return;
}
Expand Down Expand Up @@ -166,10 +166,10 @@ var autolink = (function () {
}
});
};
var $_fe1eu58tjj660zou = { setup: setup };
var $_gpsaw8tjj68z40f = { setup: setup };

global.add('autolink', function (editor) {
$_fe1eu58tjj660zou.setup(editor);
$_gpsaw8tjj68z40f.setup(editor);
});
function Plugin () {
}
Expand Down
24 changes: 12 additions & 12 deletions 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 $_5yqksf93jj660zq0 = {
var $_c8h0x793jj68z429 = {
getAutoResizeMinHeight: getAutoResizeMinHeight,
getAutoResizeMaxHeight: getAutoResizeMaxHeight,
getAutoResizeOverflowPadding: getAutoResizeOverflowPadding,
Expand Down Expand Up @@ -84,7 +84,7 @@ var autoresize = (function () {
return;
}
body = doc.body;
resizeHeight = $_5yqksf93jj660zq0.getAutoResizeMinHeight(editor);
resizeHeight = $_c8h0x793jj68z429.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 > $_5yqksf93jj660zq0.getAutoResizeMinHeight(editor)) {
if (myHeight > $_c8h0x793jj68z429.getAutoResizeMinHeight(editor)) {
resizeHeight = myHeight;
}
var maxHeight = $_5yqksf93jj660zq0.getAutoResizeMaxHeight(editor);
var maxHeight = $_c8h0x793jj68z429.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 = $_5yqksf93jj660zq0.getAutoResizeOverflowPadding(editor);
bottomMargin = $_5yqksf93jj660zq0.getAutoResizeBottomMargin(editor);
overflowPadding = $_c8h0x793jj68z429.getAutoResizeOverflowPadding(editor);
bottomMargin = $_c8h0x793jj68z429.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 ($_5yqksf93jj660zq0.shouldAutoResizeOnInit(editor)) {
if ($_c8h0x793jj68z429.shouldAutoResizeOnInit(editor)) {
editor.on('init', function () {
wait(editor, oldSize, 20, 100, function () {
wait(editor, oldSize, 5, 1000);
});
});
}
};
var $_chgmgi90jj660zpu = {
var $_fsa1f890jj68z421 = {
setup: setup,
resize: resize
};

var register = function (editor, oldSize) {
editor.addCommand('mceAutoResize', function () {
$_chgmgi90jj660zpu.resize(editor, oldSize);
$_fsa1f890jj68z421.resize(editor, oldSize);
});
};
var $_6icf5s8zjj660zpr = { register: register };
var $_9904zb8zjj68z41x = { register: register };

global.add('autoresize', function (editor) {
if (!editor.inline) {
var oldSize = Cell(0);
$_6icf5s8zjj660zpr.register(editor, oldSize);
$_chgmgi90jj660zpu.setup(editor, oldSize);
$_9904zb8zjj68z41x.register(editor, oldSize);
$_fsa1f890jj68z421.setup(editor, oldSize);
}
});
function Plugin () {
Expand Down
Loading

0 comments on commit 9aa11d7

Please sign in to comment.