From e101c7f0b27eb887a28adf34aaf51d0f2824fca9 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 11:53:24 +0530 Subject: [PATCH 1/6] #81 unwanted files removed --- .eslintignore | 4 - licenseInfo.json | 4 +- src/editor/contextmenu/jQuery.contextMenu.js | 267 ------------------- 3 files changed, 2 insertions(+), 273 deletions(-) delete mode 100755 src/editor/contextmenu/jQuery.contextMenu.js diff --git a/.eslintignore b/.eslintignore index 25b883b4..3fccb3c3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -20,10 +20,6 @@ svgedit-custom.css # Vendor/minified files src/editor/jquery.min.js -src/editor/jquery-ui - -# Previously minified though exporting -src/editor/js-hotkeys src/editor/jspdf/jspdf.min.js src/editor/jspdf/underscore-min.js diff --git a/licenseInfo.json b/licenseInfo.json index b089c3f7..9573bfe8 100644 --- a/licenseInfo.json +++ b/licenseInfo.json @@ -11,8 +11,8 @@ "deparam" ], "filesByLicense": { - "(MIT OR GPL-2.0)": ["src/editor/jquery-ui/jquery-ui-1.8.17.custom.min.js", "src/editor/jquerybbq/jquery.bbq.min.js", "src/editor/js-hotkeys/jquery.hotkeys.min.js"], - "(MIT OR GPL-2.0-or-later)": ["src/editor/contextmenu/jQuery.contextMenu.js", "src/editor/extensions/ext-server_moinsave.js"], + "(MIT OR GPL-2.0)": ["src/editor/jquerybbq/jquery.bbq.min.js"], + "(MIT OR GPL-2.0-or-later)": ["src/editor/extensions/ext-server_moinsave.js"], "Apache-2.0": ["src/editor/contextmenu.js", "src/editor/extensions/ext-foreignobject.js", "src/editor/extensions/ext-grid.js", "src/editor/extensions/ext-markers.js", "screencasts/svgopen2010/index.html", "src/editor/jgraduate/jQuery.jGraduate.js", "src/editor/extensions/mathjax/MathJax.min.js", "src/editor/extensions/mathjax/TeX-AMS-MML_SVG.js"], "LGPL-3.0-or-later": ["src/editor/jspdf/jspdf.plugin.svgToPdf.js"], "X11": ["src/editor/jspdf/jspdf.min.js"] diff --git a/src/editor/contextmenu/jQuery.contextMenu.js b/src/editor/contextmenu/jQuery.contextMenu.js deleted file mode 100755 index c20dbe89..00000000 --- a/src/editor/contextmenu/jQuery.contextMenu.js +++ /dev/null @@ -1,267 +0,0 @@ -/** - * @file jQuery Context Menu Plugin - * Cory S.N. LaViska - * A Beautiful Site ({@link https://abeautifulsite.net/}) - * Modified by Alexis Deveria - * - * More info: {@link https://abeautifulsite.net/2008/09/jquery-context-menu-plugin/} - * - * @module jQueryContextMenu - * @todo Update to latest version and adapt (and needs jQuery update as well): {@link https://github.com/swisnl/jQuery-contextMenu} - * @version 1.0.1 - * - * @license (MIT OR GPL-2.0-or-later) - * - * This plugin is dual-licensed under the GNU General Public License - * and the MIT License and is copyright A Beautiful Site, LLC. - * -*/ -import {isMac} from '../../common/browser.js'; - -/** -* @callback module:jQueryContextMenu.jQueryContextMenuListener -* @param {string} href The `href` value after the first character (for bypassing an initial `#`) -* @param {external:jQuery} srcElement The wrapped jQuery srcElement -* @param {{x: Float, y: Float, docX: Float, docY: Float}} coords -* @returns {void} -*/ - -/** -* @typedef {PlainObject} module:jQueryContextMenu.jQueryContextMenuConfig -* @property {string} menu -* @property {Float} inSpeed -* @property {Float} outSpeed -* @property {boolean} allowLeft -*/ - -/** -* Adds {@link external:jQuery.fn.contextMenu}, -* {@link external:jQuery.fn.disableContextMenuItems}, -* {@link external:jQuery.fn.enableContextMenuItems}, -* {@link external:jQuery.fn.disableContextMenu}, -* {@link external:jQuery.fn.enableContextMenu}, -* {@link external:jQuery.fn.destroyContextMenu}. -* @function module:jQueryContextMenu.jQueryContextMenu -* @param {external:jQuery} $ The jQuery object to wrap (with `contextMenu`, `disableContextMenuItems`, `enableContextMenuItems`, `disableContextMenu`, `enableContextMenu`, `destroyContextMenu`) -* @returns {external:jQuery} -*/ -function jQueryContextMenu ($) { - const win = $(window); - const doc = $(document); - - $.extend($.fn, { - /** - * @memberof external:jQuery.fn - * @param {module:jQueryContextMenu.jQueryContextMenuConfig} o - * @param {module:jQueryContextMenu.jQueryContextMenuListener} listener - * @returns {external:jQuery} - */ - contextMenu (o, listener) { - // Defaults - if (o.menu === undefined) return false; - if (o.inSpeed === undefined) o.inSpeed = 150; - if (o.outSpeed === undefined) o.outSpeed = 75; - // 0 needs to be -1 for expected results (no fade) - if (o.inSpeed === 0) o.inSpeed = -1; - if (o.outSpeed === 0) o.outSpeed = -1; - // Loop each context menu - $(this).each(function () { - const el = $(this); - const offset = $(el).offset(); - - const menu = $('#' + o.menu); - - // Add contextMenu class - menu.addClass('contextMenu'); - // Simulate a true right click - $(this).bind('mousedown', function (evt) { - $(this).mouseup(function (e) { - const srcElement = $(this); - srcElement.unbind('mouseup'); - - if (!(evt.button === 2 || o.allowLeft || - (evt.ctrlKey && isMac()))) { - return undefined; - } - e.stopPropagation(); - // Hide context menus that may be showing - $('.contextMenu').hide(); - // Get this context menu - - if (el.hasClass('disabled')) return false; - - // Detect mouse position - let x = e.pageX, y = e.pageY; - - const xOff = win.width() - menu.width(), - yOff = win.height() - menu.height(); - - if (x > xOff - 15) x = xOff - 15; - if (y > yOff - 30) y = yOff - 30; // 30 is needed to prevent scrollbars in FF - - // Show the menu - doc.unbind('click'); - menu.css({top: y, left: x}).fadeIn(o.inSpeed); - // Hover events - menu.find('A').mouseover(function () { - menu.find('LI.hover').removeClass('hover'); - $(this).parent().addClass('hover'); - }).mouseout(function () { - menu.find('LI.hover').removeClass('hover'); - }); - - // Keyboard - doc.keypress(function (ev) { - switch (ev.keyCode) { - case 38: // up - if (!menu.find('LI.hover').length) { - menu.find('LI:last').addClass('hover'); - } else { - menu.find('LI.hover').removeClass('hover').prevAll('LI:not(.disabled)').eq(0).addClass('hover'); - if (!menu.find('LI.hover').length) menu.find('LI:last').addClass('hover'); - } - break; - case 40: // down - if (!menu.find('LI.hover').length) { - menu.find('LI:first').addClass('hover'); - } else { - menu.find('LI.hover').removeClass('hover').nextAll('LI:not(.disabled)').eq(0).addClass('hover'); - if (!menu.find('LI.hover').length) menu.find('LI:first').addClass('hover'); - } - break; - case 13: // enter - menu.find('LI.hover A').trigger('click'); - break; - case 27: // esc - doc.trigger('click'); - break; - } - }); - - // When items are selected - menu.find('A').unbind('mouseup'); - menu.find('LI:not(.disabled) A').mouseup(function () { - doc.unbind('click').unbind('keypress'); - $('.contextMenu').hide(); - if (listener) { - listener($(this).attr('href').substr(1), $(srcElement), { - x: x - offset.left, y: y - offset.top, docX: x, docY: y - }); - } - return false; - }); - - // Hide bindings - setTimeout(function () { // Delay for Mozilla - doc.click(function () { - doc.unbind('click').unbind('keypress'); - menu.fadeOut(o.outSpeed); - return false; - }); - }, 0); - return undefined; - }); - }); - - // Disable text selection - if ($.browser.mozilla) { - $('#' + o.menu).each(function () { $(this).css({MozUserSelect: 'none'}); }); - } else if ($.browser.msie) { - $('#' + o.menu).each(function () { $(this).bind('selectstart.disableTextSelect', function () { return false; }); }); - } else { - $('#' + o.menu).each(function () { $(this).bind('mousedown.disableTextSelect', function () { return false; }); }); - } - // Disable browser context menu (requires both selectors to work in IE/Safari + FF/Chrome) - $(el).add($('UL.contextMenu')).bind('contextmenu', function () { return false; }); - }); - return $(this); - }, - - /** - * Disable context menu items on the fly. - * @memberof external:jQuery.fn - * @param {void|string} o Comma-separated - * @returns {external:jQuery} - */ - disableContextMenuItems (o) { - if (o === undefined) { - // Disable all - $(this).find('LI').addClass('disabled'); - return $(this); - } - $(this).each(function () { - if (o !== undefined) { - const d = o.split(','); - for (const href of d) { - $(this).find('A[href="' + href + '"]').parent().addClass('disabled'); - } - } - }); - return $(this); - }, - - /** - * Enable context menu items on the fly. - * @memberof external:jQuery.fn - * @param {void|string} o Comma-separated - * @returns {external:jQuery} - */ - enableContextMenuItems (o) { - if (o === undefined) { - // Enable all - $(this).find('LI.disabled').removeClass('disabled'); - return $(this); - } - $(this).each(function () { - if (o !== undefined) { - const d = o.split(','); - for (const href of d) { - $(this).find('A[href="' + href + '"]').parent().removeClass('disabled'); - } - } - }); - return $(this); - }, - - /** - * Disable context menu(s). - * @memberof external:jQuery.fn - * @returns {external:jQuery} - */ - disableContextMenu () { - $(this).each(function () { - $(this).addClass('disabled'); - }); - return $(this); - }, - - /** - * Enable context menu(s). - * @memberof external:jQuery.fn - * @returns {external:jQuery} - */ - enableContextMenu () { - $(this).each(function () { - $(this).removeClass('disabled'); - }); - return $(this); - }, - - /** - * Destroy context menu(s). - * @memberof external:jQuery.fn - * @returns {external:jQuery} - */ - destroyContextMenu () { - // Destroy specified context menus - $(this).each(function () { - // Disable action - $(this).unbind('mousedown').unbind('mouseup'); - }); - return $(this); - } - }); - return $; -} - -export default jQueryContextMenu; From 8a3272dd93f018296acd20861112073ca37a1f04 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 12:22:15 +0530 Subject: [PATCH 2/6] #81 folder name renamed --- nyc.config.js | 3 --- src/editor/{jquery-ui => dragmove}/dragmove.js | 0 2 files changed, 3 deletions(-) rename src/editor/{jquery-ui => dragmove}/dragmove.js (100%) diff --git a/nyc.config.js b/nyc.config.js index 5e831ff2..2bc336b0 100644 --- a/nyc.config.js +++ b/nyc.config.js @@ -8,9 +8,6 @@ module.exports = { 'editor/jquery.min.js', 'editor/jgraduate/**', 'editor/svgicons/**', - 'editor/jquery-ui/**', - 'editor/js-hotkeys/**', - 'editor/contextmenu/**', 'editor/spinbtn' ], "reporter": [ diff --git a/src/editor/jquery-ui/dragmove.js b/src/editor/dragmove/dragmove.js similarity index 100% rename from src/editor/jquery-ui/dragmove.js rename to src/editor/dragmove/dragmove.js From 3bb7e4e93be6993eecdb1f0ff4ddbe8fba7a0895 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 12:37:58 +0530 Subject: [PATCH 3/6] #81 folder rename changes --- nyc.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/nyc.config.js b/nyc.config.js index 2bc336b0..1ac0a362 100644 --- a/nyc.config.js +++ b/nyc.config.js @@ -8,6 +8,7 @@ module.exports = { 'editor/jquery.min.js', 'editor/jgraduate/**', 'editor/svgicons/**', + 'editor/dragmove/**', 'editor/spinbtn' ], "reporter": [ From 85f2e363df0edb958ba8980f5dedc7c50527d79f Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 13:19:43 +0530 Subject: [PATCH 4/6] #81 jquery-ui folder renamed --- .../extensions/ext-overview_window/ext-overview_window.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/extensions/ext-overview_window/ext-overview_window.js b/src/editor/extensions/ext-overview_window/ext-overview_window.js index d6a2d737..94e9933c 100644 --- a/src/editor/extensions/ext-overview_window/ext-overview_window.js +++ b/src/editor/extensions/ext-overview_window/ext-overview_window.js @@ -6,7 +6,7 @@ * @copyright 2013 James Sacksteder * */ -import { dragmove } from '../../jquery-ui/dragmove.js'; +import { dragmove } from '../../dragmove/dragmove.js'; export default { name: 'overview_window', init ({$, isChrome}) { From 5384fb68048cee1782e9628fdd01dafc0b7b34e6 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 13:30:31 +0530 Subject: [PATCH 5/6] #81 jquery modify changes --- src/editor/ConfigObj.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/editor/ConfigObj.js b/src/editor/ConfigObj.js index 53133c9d..90bd4f56 100644 --- a/src/editor/ConfigObj.js +++ b/src/editor/ConfigObj.js @@ -1,7 +1,6 @@ -/* globals $ */ - // eslint-disable-next-line node/no-unpublished-import import deparam from 'deparam'; +import {mergeDeep} from './components/jgraduate/Util.js'; /** * Escapes special characters in a regular expression. @@ -398,7 +397,8 @@ export default class ConfigObj { */ const extendOrAdd = (cfgObj, key, val) => { if (cfgObj[key] && typeof cfgObj[key] === 'object') { - $.extend(true, cfgObj[key], val); + // $.extend(true, cfgObj[key], val); + cfgObj[key] = mergeDeep(cfgObj[key], val); } else { cfgObj[key] = val; } @@ -446,7 +446,8 @@ export default class ConfigObj { extendOrAdd(this.defaultConfig, key, val); } else if (this.defaultConfig[key] && typeof this.defaultConfig[key] === 'object') { this.curConfig[key] = Array.isArray(this.defaultConfig[key]) ? [] : {}; - $.extend(true, this.curConfig[key], val); // Merge properties recursively, e.g., on initFill, initStroke objects + this.curConfig[key] = mergeDeep(this.curConfig[key], val); + // $.extend(true, this.curConfig[key], val); // Merge properties recursively, e.g., on initFill, initStroke objects } else { this.curConfig[key] = val; } From 1febc8588c318f08ccf785f59932cd2ac308eb08 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 14:40:41 +0530 Subject: [PATCH 6/6] #81 globals $ removed --- src/editor/components/seColorPicker.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/editor/components/seColorPicker.js b/src/editor/components/seColorPicker.js index 94b3f8d9..233c6211 100644 --- a/src/editor/components/seColorPicker.js +++ b/src/editor/components/seColorPicker.js @@ -1,6 +1,4 @@ -/* globals $ */ import {jGraduate, jGraduateMethod} from './jgraduate/jQuery.jGraduate.js'; -// import jQueryPluginJPicker from './jgraduate/jQuery.jPicker.js'; import PaintBox from './PaintBox.js'; const template = document.createElement('template'); @@ -170,7 +168,7 @@ export class SeColorPicker extends HTMLElement { */ connectedCallback () { this.paintBox = new PaintBox(this.$block, this.type); - $(this.$picker).click(() => { + this.$picker.addEventListener('click', () => { let {paint} = this.paintBox; jGraduateMethod( this.$color_picker,