Merge pull request #519 from SVG-Edit/jQ-remove

stop using local outdated version of jquery and use latest npm version

badges/tests-badge.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="83" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h42v20H41z"/><path fill="url(#smooth)" d="M0 0h83v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">21/21</text><text class="high" x="46" y="14">21/21</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">139/139</text><text class="high" x="46" y="14">139/139</text></g></svg>

cypress/integration/unit/contextmenu.js

@@ -1,4 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
+window.$ = $;
 import * as contextmenu from '../../../instrumented/editor/contextmenu.js';
 
 describe('contextmenu', function () {

cypress/integration/unit/coords.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+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';

cypress/integration/unit/draw.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+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';

cypress/integration/unit/history.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+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';

cypress/integration/unit/math.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as math from '../../../instrumented/svgcanvas/math.js';
 

cypress/integration/unit/path.js

@@ -1,7 +1,7 @@
 /* globals SVGPathSeg */
 import 'pathseg';
-
+import $ from 'jquery';
-import '../../../instrumented/editor/jquery.min.js';
+window.$ = $;
 
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/recalculate.js

@@ -1,10 +1,11 @@
-import '../../../instrumented/editor/jquery.min.js';
+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';
 import * as recalculate from '../../../instrumented/svgcanvas/recalculate.js';
 
+
 describe('recalculate', function () {
   // eslint-disable-next-line no-shadow
   const root = document.createElement('div');

cypress/integration/unit/sanitize.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as sanitize from '../../../instrumented/svgcanvas/sanitize.js';
 

cypress/integration/unit/select.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import * as select from '../../../instrumented/svgcanvas/select.js';
 import { NS } from '../../../instrumented/common/namespaces.js';
 

cypress/integration/unit/svgtransformlist.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+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';

cypress/integration/unit/test1.js

@@ -1,5 +1,6 @@
 /* eslint-disable max-len, no-console */
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
+window.$ = $;
 
 import SvgCanvas from '../../../instrumented/svgcanvas/svgcanvas.js';
 

cypress/integration/unit/units.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import * as units from '../../../instrumented/common/units.js';
 
 describe('units', function () {

cypress/integration/unit/utilities-bbox.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 import 'pathseg';
-
+import $ from 'jquery';
-import '../../../instrumented/editor/jquery.min.js';
+window.$ = $;
 
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/utilities-performance.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len, no-console */
 import 'pathseg';
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
+window.$ = $;
 
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/utilities.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
-import '../../../instrumented/editor/jquery.min.js';
+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';

package-lock.json

@@ -15,6 +15,7 @@
         "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",
@@ -14399,6 +14400,11 @@
       "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",
@@ -36456,6 +36462,11 @@
       "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",

package.json

@@ -99,6 +99,7 @@
     "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",

src/editor/extensions/ext-imagelib/index.js

@@ -1,5 +1,4 @@
-/* globals jQuery */
+/* globals $ */
-const $ = jQuery;
 const atags = document.querySelectorAll('a');
 Array.prototype.forEach.call(atags, function (aEle) {
   aEle.addEventListener('click', function (event) {

src/editor/index.js

@@ -4,9 +4,15 @@ For default config and extensions (and available options) available to
 `setConfig()`, see the file `docs/tutorials/ConfigOptions.md`
 */
 
-import './jquery.min.js';
+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';
 import Editor from './Editor.js';
 
+// Global Constant
+window.$ = jQueryPluginSVG(jQuery);
+
 const svgEditor = new Editor();
 svgEditor.init();
 

src/svgcanvas/elem-get-set.js

@@ -3,6 +3,7 @@
  * @license MIT
  * @copyright 2011 Jeff Schiller
  */
+
 import { jGraduate } from '../editor/components/jgraduate/jQuery.jGraduate.js';
 import * as hstry from './history.js';
 import { NS } from '../common/namespaces.js';

src/svgcanvas/path-actions.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Path functionality.
  * @module path
@@ -23,8 +23,6 @@ import {
   isWebkit
 } from '../common/browser.js';
 
-const $ = jQuery;
-
 let pathActionsContext_ = null;
 let editorContext_ = null;
 let path = null;

src/svgcanvas/recalculate.js

@@ -1,11 +1,10 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Recalculate.
  * @module recalculate
  * @license MIT
  */
 
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute setting and array form with `attr`
 import { NS } from '../common/namespaces.js';
 import { convertToNum } from '../common/units.js';
 import { isWebkit } from '../common/browser.js';
@@ -18,8 +17,6 @@ import {
   hasMatrixTransform
 } from './math.js';
 
-const $ = jQueryPluginSVG(jQuery);
-
 let context_;
 
 /**

src/svgcanvas/selected-elem.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Tools for SVG selected element operation.
  * @module selected-elem
@@ -6,7 +6,7 @@
  *
  * @copyright 2010 Alexis Deveria, 2010 Jeff Schiller
  */
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute
+
 import { NS } from '../common/namespaces.js';
 import * as hstry from './history.js';
 import * as pathModule from './path.js';
@@ -31,7 +31,6 @@ import { getParents } from '../editor/components/jgraduate/Util.js';
 const {
   MoveElementCommand, BatchCommand, InsertElementCommand, RemoveElementCommand, ChangeElementCommand
 } = hstry;
-const $ = jQueryPluginSVG(jQuery);
 
 let elementContext_ = null;
 

src/svgcanvas/svg-exec.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Tools for svg.
  * @module svg
@@ -8,7 +8,6 @@
 
 import { jsPDF } from 'jspdf/dist/jspdf.es.min.js';
 import 'svg2pdf.js/dist/svg2pdf.es.js';
-import jQueryPluginSVG from './jQuery.attr.js';
 import * as hstry from './history.js';
 import {
   text2xml, cleanupElement, findDefs, getHref, preventClickDefault,
@@ -36,8 +35,6 @@ const {
   ChangeElementCommand, BatchCommand
 } = hstry;
 
-const $ = jQueryPluginSVG(jQuery);
-
 let svgContext_ = null;
 let $id = null;
 

src/svgcanvas/svgcanvas.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Numerous tools for working with the editor's "canvas".
  * @module svgcanvas
@@ -12,8 +12,6 @@
 import { Canvg as canvg } from 'canvg';
 import 'pathseg';
 
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute setting and array form with `attr`
-
 import * as pathModule from './path.js';
 import * as hstry from './history.js';
 import * as draw from './draw.js';
@@ -114,7 +112,6 @@ import {
   getClosest, getParents, mergeDeep
 } from '../editor/components/jgraduate/Util.js';
 
-const $ = jQueryPluginSVG(jQuery);
 const {
   MoveElementCommand, InsertElementCommand, RemoveElementCommand,
   ChangeElementCommand, BatchCommand

src/svgcanvas/utilities.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Miscellaneous utilities.
  * @module utilities
@@ -7,7 +7,6 @@
  * @copyright 2010 Alexis Deveria, 2010 Jeff Schiller
  */
 
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute setting and array form with `attr`
 import { NS } from '../common/namespaces.js';
 import { getTransformList } from './svgtransformlist.js';
 import { setUnitAttr, getTypeMap } from '../common/units.js';
@@ -20,9 +19,6 @@ import {
 } from '../common/browser.js';
 import { getClosest } from '../editor/components/jgraduate/Util.js';
 
-// Constants
-const $ = jQueryPluginSVG(jQuery);
-
 // String used to encode base64.
 const KEYSTR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';