From 51d817f7a9619e9a0285c2b76e8cd9dad18d5180 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 12:00:07 +0530 Subject: [PATCH 1/9] #105 coolor picker slider issue fixed --- src/editor/components/jgraduate/Util.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/editor/components/jgraduate/Util.js b/src/editor/components/jgraduate/Util.js index bef100a4..20a2399d 100644 --- a/src/editor/components/jgraduate/Util.js +++ b/src/editor/components/jgraduate/Util.js @@ -10,7 +10,8 @@ export function findPos(obj) { do { curleft += obj.offsetLeft; curtop += obj.offsetTop; - } while (obj == obj.offsetParent); + // eslint-disable-next-line no-cond-assign + } while (obj = obj.offsetParent); return { left: curleft, top: curtop }; } return { left: curleft, top: curtop }; From e310b41020fe2487b73f84d2f1d9bb18c3778ac1 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 14:57:11 +0530 Subject: [PATCH 2/9] #105 $.ajax change to fetch --- src/editor/Editor.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index b8a7420b..39f4afbc 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -1,5 +1,5 @@ /* eslint-disable max-len */ -/* globals seConfirm seAlert $ */ +/* globals seConfirm seAlert */ /** * The main module for the visual SVG this. * @@ -1144,32 +1144,32 @@ class Editor extends EditorStartup { loadFromURL(url, { cache, noAlert } = {}) { return this.ready(() => { return new Promise((resolve, reject) => { - $.ajax({ - url, - dataType: 'text', - cache: Boolean(cache), - beforeSend() { - $.process_cancel(this.i18next.t('notification.loadingImage')); - }, - success(str) { - this.loadSvgString(str, { noAlert }); - }, - error(xhr, stat, err) { - if (xhr.status !== 404 && xhr.responseText) { - this.loadSvgString(xhr.responseText, { noAlert }); - return; + fetch (url, { cache: cache ? 'force-cache' : 'no-cache' }) + .then( (response) => + { + if (!response.ok) { + if (noAlert) { + reject(new Error('URLLoadFail')); + return; + } + seAlert(this.i18next.t('notification.URLLoadFail') ); + resolve(); } + return response.text(); + }) + .then( (str) => + { + this.loadSvgString(str, { noAlert }); + return str; + }) + .catch( (error) => { if (noAlert) { reject(new Error('URLLoadFail')); return; } - seAlert(this.i18next.t('notification.URLLoadFail') + ': \n' + err); + seAlert(this.i18next.t('notification.URLLoadFail') + ': \n' + error); resolve(); - }, - complete() { - if ($id("dialog_box") != null) $id("dialog_box").style.display = 'none'; - } - }); + }); }); }); } From c7a1588a8959ca1586e3e922bcc427bf3f99acf9 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 18:23:56 +0530 Subject: [PATCH 3/9] #105 addextension jquery removed changes --- src/editor/EditorStartup.js | 4 ++-- .../extensions/ext-server_opensave/ext-server_opensave.js | 4 ++-- src/svgcanvas/svgcanvas.js | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/editor/EditorStartup.js b/src/editor/EditorStartup.js index 50b1a7f6..b542f223 100644 --- a/src/editor/EditorStartup.js +++ b/src/editor/EditorStartup.js @@ -722,7 +722,7 @@ class EditorStartup { // eslint-disable-next-line no-unsanitized/method const imported = await import(`./extensions/${encodeURIComponent(extname)}/${encodeURIComponent(extname)}.js`); const { name = extname, init: initfn } = imported.default; - return this.addExtension(name, (initfn && initfn.bind(this)), { $, langParam: 'en' }); /** @todo change to current lng */ + return this.addExtension(name, (initfn && initfn.bind(this)), { langParam: 'en' }); /** @todo change to current lng */ } catch (err) { // Todo: Add config to alert any errors console.error('Extension failed to load: ' + extname + '; ', err); @@ -746,7 +746,7 @@ class EditorStartup { // eslint-disable-next-line no-unsanitized/method const imported = await import(encodeURI(extPathName)); const { name, init: initfn } = imported.default; - return this.addExtension(name, (initfn && initfn.bind(this)), { $ }); + return this.addExtension(name, (initfn && initfn.bind(this)), {}); } catch (err) { // Todo: Add config to alert any errors console.error('Extension failed to load: ' + extPathName + '; ', err); diff --git a/src/editor/extensions/ext-server_opensave/ext-server_opensave.js b/src/editor/extensions/ext-server_opensave/ext-server_opensave.js index a21a2945..bf8c5929 100644 --- a/src/editor/extensions/ext-server_opensave/ext-server_opensave.js +++ b/src/editor/extensions/ext-server_opensave/ext-server_opensave.js @@ -23,7 +23,7 @@ const loadExtensionTranslation = async function (lang) { export default { name: 'server_opensave', - async init ({ $, decode64, encode64 }) { + async init ({ decode64, encode64 }) { const svgEditor = this; const strings = await loadExtensionTranslation(svgEditor.configObj.pref('lang')); const { @@ -262,7 +262,7 @@ export default { form.submit(); rebuildInput(form); - await $.process_cancel(strings.uploading); + // await $.process_cancel(strings.uploading); cancelled = true; if($id("dialog_box") != null) $id("dialog_box").style.display = 'none'; } diff --git a/src/svgcanvas/svgcanvas.js b/src/svgcanvas/svgcanvas.js index 42e8bcc8..3998e52a 100644 --- a/src/svgcanvas/svgcanvas.js +++ b/src/svgcanvas/svgcanvas.js @@ -854,7 +854,7 @@ class SvgCanvas { * if extension of supplied name already exists * @returns {Promise} Resolves to `undefined` */ - this.addExtension = async function (name, extInitFunc, { $: jq, importLocale }) { + this.addExtension = async function (name, extInitFunc, { importLocale }) { if (typeof extInitFunc !== 'function') { throw new TypeError('Function argument expected for `svgcanvas.addExtension`'); } @@ -875,7 +875,6 @@ class SvgCanvas { * @see {@link module:svgcanvas.PrivateMethods} source for the other methods/properties */ const argObj = canvas.mergeDeep(canvas.getPrivateMethods(), { - $: jq, importLocale, svgroot, svgcontent, From 70adf0d784968b0a29836d78389885a0c2c05b67 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 18:34:47 +0530 Subject: [PATCH 4/9] #105 whilelist to add se:connector --- src/svgcanvas/sanitize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/svgcanvas/sanitize.js b/src/svgcanvas/sanitize.js index 974150e9..f01b7135 100644 --- a/src/svgcanvas/sanitize.js +++ b/src/svgcanvas/sanitize.js @@ -50,7 +50,7 @@ const svgWhiteList_ = { path: [ 'class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ], pattern: [ 'class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y' ], polygon: [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ], - polyline: [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ], + polyline: [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'se:connector' ], radialGradient: [ 'class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href' ], rect: [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y' ], stop: [ 'class', 'id', 'offset', 'requiredFeatures', 'stop-opacity', 'style', 'systemLanguage', 'stop-color', 'gradientUnits', 'gradientTransform' ], From af82fe2d5c3b2986f7888e16a7500e2fddab6f59 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 19:15:48 +0530 Subject: [PATCH 5/9] #105 jquery include removed --- src/editor/Editor.js | 4 ---- src/editor/extensions/ext-imagelib/index.html | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 39f4afbc..c782db77 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -14,12 +14,8 @@ * @module SVGEditor */ -import jQuery from 'jquery/dist/jquery.slim.js'; -import jQueryPluginSVG from '../svgcanvas/jQuery.attr.js'; // Needed for SVG attribute import './components/index.js'; import './dialogs/index.js'; -// Global Constant -window.$ = jQueryPluginSVG(jQuery); import './touch.js'; import { isMac } from '../common/browser.js'; diff --git a/src/editor/extensions/ext-imagelib/index.html b/src/editor/extensions/ext-imagelib/index.html index 2374b06c..34b7ff1c 100644 --- a/src/editor/extensions/ext-imagelib/index.html +++ b/src/editor/extensions/ext-imagelib/index.html @@ -9,9 +9,6 @@ - - - From a34fe9232a769b58d28209a9e997fb505f042952 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 19:24:53 +0530 Subject: [PATCH 6/9] #105 polygon attributies added in whitelist --- src/svgcanvas/sanitize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/svgcanvas/sanitize.js b/src/svgcanvas/sanitize.js index f01b7135..aa30915e 100644 --- a/src/svgcanvas/sanitize.js +++ b/src/svgcanvas/sanitize.js @@ -49,7 +49,7 @@ const svgWhiteList_ = { metadata: [ 'class', 'id' ], path: [ 'class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ], pattern: [ 'class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y' ], - polygon: [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ], + polygon: [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'sides', 'shape' ], polyline: [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'se:connector' ], radialGradient: [ 'class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href' ], rect: [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y' ], From 77c814fd5c6ab9417c8daa135697b4ea26cd7083 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 19:29:25 +0530 Subject: [PATCH 7/9] #105 jquery global removed --- src/editor/EditorStartup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/EditorStartup.js b/src/editor/EditorStartup.js index b542f223..f2b66ade 100644 --- a/src/editor/EditorStartup.js +++ b/src/editor/EditorStartup.js @@ -1,4 +1,4 @@ -/* globals $ seConfirm seAlert */ +/* globals seConfirm seAlert */ import './touch.js'; import { convertUnit } from '../common/units.js'; import { From 52f26764fefebdb37bcb33327c0a164a3fb5432c Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 19:32:22 +0530 Subject: [PATCH 8/9] #105 package.json to remove jquery --- package-lock.json | 37 +++++++++++++------------------------ package.json | 1 - 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52602a78..379d2d35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "svgedit", "version": "7.0.0-preview", "license": "(MIT AND Apache-2.0 AND ISC AND LGPL-3.0-or-later AND X11)", "dependencies": { @@ -12,10 +13,8 @@ "@web/dev-server-rollup": "0.3.4", "canvg": "3.0.7", "core-js": "3.12.1", - "deparam": "1.0.5", "elix": "15.0.0", "i18next": "20.3.0", - "jquery": "3.6.0", "jspdf": "2.3.1", "pathseg": "1.2.0", "regenerator-runtime": "0.13.7", @@ -4254,6 +4253,7 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -7351,6 +7351,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -9265,11 +9266,6 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, - "node_modules/deparam": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/deparam/-/deparam-1.0.5.tgz", - "integrity": "sha1-dAEbur0mtA+GDD48ws1hvtTrQ/I=" - }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -9918,7 +9914,8 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -14400,11 +14397,6 @@ "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==", "dev": true }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" - }, "node_modules/js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", @@ -14714,7 +14706,8 @@ "canvg": "^3.0.6", "core-js": "^3.6.0", "dompurify": "^2.2.0", - "fflate": "^0.4.8" + "fflate": "^0.4.8", + "html2canvas": "^1.0.0-rc.5" }, "optionalDependencies": { "html2canvas": "^1.0.0-rc.5" @@ -16285,6 +16278,7 @@ "integrity": "sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==", "dev": true, "dependencies": { + "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -16526,6 +16520,7 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -20254,6 +20249,9 @@ "version": "2.48.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.48.0.tgz", "integrity": "sha512-wl9ZSSSsi5579oscSDYSzGn092tCS076YB+TQrzsGuSfYyJeep8eEWj0eaRjuC5McuMNmcnR8icBqiE/FWNB1A==", + "dependencies": { + "fsevents": "~2.3.1" + }, "bin": { "rollup": "dist/bin/rollup" }, @@ -22841,6 +22839,7 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", + "fsevents": "~2.1.2", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -32291,11 +32290,6 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, - "deparam": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/deparam/-/deparam-1.0.5.tgz", - "integrity": "sha1-dAEbur0mtA+GDD48ws1hvtTrQ/I=" - }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -36462,11 +36456,6 @@ "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==", "dev": true }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" - }, "js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", diff --git a/package.json b/package.json index 44f0170b..29200891 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,6 @@ "core-js": "3.12.1", "elix": "15.0.0", "i18next": "20.3.0", - "jquery": "3.6.0", "jspdf": "2.3.1", "pathseg": "1.2.0", "regenerator-runtime": "0.13.7", From 4b337f00e04f118a23950079ee6fceef730fa612 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Tue, 1 Jun 2021 20:13:42 +0530 Subject: [PATCH 9/9] #105 jquery remove from cypress --- cypress/integration/unit/contextmenu.js | 2 -- cypress/integration/unit/coords.js | 2 -- cypress/integration/unit/draw.js | 2 -- cypress/integration/unit/history.js | 2 -- cypress/integration/unit/math.js | 2 -- cypress/integration/unit/path.js | 3 --- cypress/integration/unit/recalculate.js | 2 -- cypress/integration/unit/sanitize.js | 2 -- cypress/integration/unit/select.js | 2 -- cypress/integration/unit/svgtransformlist.js | 2 -- cypress/integration/unit/test1.js | 3 --- cypress/integration/unit/units.js | 2 -- cypress/integration/unit/utilities-bbox.js | 2 -- cypress/integration/unit/utilities-performance.js | 2 -- cypress/integration/unit/utilities.js | 2 -- 15 files changed, 32 deletions(-) diff --git a/cypress/integration/unit/contextmenu.js b/cypress/integration/unit/contextmenu.js index dfe7b212..b906ebcf 100644 --- a/cypress/integration/unit/contextmenu.js +++ b/cypress/integration/unit/contextmenu.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import * as contextmenu from '../../../instrumented/editor/contextmenu.js'; describe('contextmenu', function () { diff --git a/cypress/integration/unit/coords.js b/cypress/integration/unit/coords.js index 412a07be..4fa28d76 100644 --- a/cypress/integration/unit/coords.js +++ b/cypress/integration/unit/coords.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import * as coords from '../../../instrumented/svgcanvas/coords.js'; diff --git a/cypress/integration/unit/draw.js b/cypress/integration/unit/draw.js index 53d48d35..2828ca05 100644 --- a/cypress/integration/unit/draw.js +++ b/cypress/integration/unit/draw.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as draw from '../../../instrumented/svgcanvas/draw.js'; import * as units from '../../../instrumented/common/units.js'; diff --git a/cypress/integration/unit/history.js b/cypress/integration/unit/history.js index 4082bb79..abf37408 100644 --- a/cypress/integration/unit/history.js +++ b/cypress/integration/unit/history.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as transformlist from '../../../instrumented/svgcanvas/svgtransformlist.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/math.js b/cypress/integration/unit/math.js index fcda07ab..cd033b5c 100644 --- a/cypress/integration/unit/math.js +++ b/cypress/integration/unit/math.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as math from '../../../instrumented/svgcanvas/math.js'; diff --git a/cypress/integration/unit/path.js b/cypress/integration/unit/path.js index 6b58535d..d6ce68fc 100644 --- a/cypress/integration/unit/path.js +++ b/cypress/integration/unit/path.js @@ -1,8 +1,5 @@ /* globals SVGPathSeg */ import 'pathseg'; -import $ from 'jquery'; -window.$ = $; - import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import * as pathModule from '../../../instrumented/svgcanvas/path.js'; diff --git a/cypress/integration/unit/recalculate.js b/cypress/integration/unit/recalculate.js index cf6254a9..195d25c6 100644 --- a/cypress/integration/unit/recalculate.js +++ b/cypress/integration/unit/recalculate.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import * as coords from '../../../instrumented/svgcanvas/coords.js'; diff --git a/cypress/integration/unit/sanitize.js b/cypress/integration/unit/sanitize.js index 9ba73846..12f555da 100644 --- a/cypress/integration/unit/sanitize.js +++ b/cypress/integration/unit/sanitize.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as sanitize from '../../../instrumented/svgcanvas/sanitize.js'; diff --git a/cypress/integration/unit/select.js b/cypress/integration/unit/select.js index f4c83df2..c839b467 100644 --- a/cypress/integration/unit/select.js +++ b/cypress/integration/unit/select.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import * as select from '../../../instrumented/svgcanvas/select.js'; import { NS } from '../../../instrumented/common/namespaces.js'; diff --git a/cypress/integration/unit/svgtransformlist.js b/cypress/integration/unit/svgtransformlist.js index c4f78d63..fed8abdb 100644 --- a/cypress/integration/unit/svgtransformlist.js +++ b/cypress/integration/unit/svgtransformlist.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as transformlist from '../../../instrumented/svgcanvas/svgtransformlist.js'; import { disableSupportsNativeTransformLists } from '../../../instrumented/common/browser.js'; diff --git a/cypress/integration/unit/test1.js b/cypress/integration/unit/test1.js index c438928f..7f8c954a 100644 --- a/cypress/integration/unit/test1.js +++ b/cypress/integration/unit/test1.js @@ -1,7 +1,4 @@ /* eslint-disable max-len, no-console */ -import $ from 'jquery'; -window.$ = $; - import SvgCanvas from '../../../instrumented/svgcanvas/svgcanvas.js'; describe('Basic Module', function () { diff --git a/cypress/integration/unit/units.js b/cypress/integration/unit/units.js index 9bfeec35..99e2e7bd 100644 --- a/cypress/integration/unit/units.js +++ b/cypress/integration/unit/units.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -window.$ = $; import * as units from '../../../instrumented/common/units.js'; describe('units', function () { diff --git a/cypress/integration/unit/utilities-bbox.js b/cypress/integration/unit/utilities-bbox.js index e76d12b1..7b8aa203 100644 --- a/cypress/integration/unit/utilities-bbox.js +++ b/cypress/integration/unit/utilities-bbox.js @@ -1,7 +1,5 @@ /* eslint-disable max-len */ import 'pathseg'; -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/utilities-performance.js b/cypress/integration/unit/utilities-performance.js index 74d5b595..c5cb0805 100644 --- a/cypress/integration/unit/utilities-performance.js +++ b/cypress/integration/unit/utilities-performance.js @@ -1,7 +1,5 @@ /* eslint-disable max-len, no-console */ import 'pathseg'; -import $ from 'jquery'; -window.$ = $; import { NS } from '../../../instrumented/common/namespaces.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; diff --git a/cypress/integration/unit/utilities.js b/cypress/integration/unit/utilities.js index 0e15abd8..aa70e571 100644 --- a/cypress/integration/unit/utilities.js +++ b/cypress/integration/unit/utilities.js @@ -1,6 +1,4 @@ /* eslint-disable max-len */ -import $ from 'jquery'; -window.$ = $; import * as browser from '../../../instrumented/common/browser.js'; import * as utilities from '../../../instrumented/svgcanvas/utilities.js'; import { NS } from '../../../instrumented/common/namespaces.js';