remove local jquery file and update to latest npm version

This commit is contained in:
JFH
2021-05-23 16:46:01 +02:00
parent 26fc8eeb49
commit 812bc2371c
12 changed files with 28 additions and 30 deletions

11
package-lock.json generated
View File

@@ -15,6 +15,7 @@
"deparam": "1.0.5", "deparam": "1.0.5",
"elix": "15.0.0", "elix": "15.0.0",
"i18next": "20.3.0", "i18next": "20.3.0",
"jquery": "3.6.0",
"jspdf": "2.3.1", "jspdf": "2.3.1",
"pathseg": "1.2.0", "pathseg": "1.2.0",
"regenerator-runtime": "0.13.7", "regenerator-runtime": "0.13.7",
@@ -14399,6 +14400,11 @@
"integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==", "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==",
"dev": true "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": { "node_modules/js-base64": {
"version": "2.6.4", "version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -36456,6 +36462,11 @@
"integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==", "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==",
"dev": true "dev": true
}, },
"jquery": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
"integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
},
"js-base64": { "js-base64": {
"version": "2.6.4", "version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",

View File

@@ -99,6 +99,7 @@
"deparam": "1.0.5", "deparam": "1.0.5",
"elix": "15.0.0", "elix": "15.0.0",
"i18next": "20.3.0", "i18next": "20.3.0",
"jquery": "3.6.0",
"jspdf": "2.3.1", "jspdf": "2.3.1",
"pathseg": "1.2.0", "pathseg": "1.2.0",
"regenerator-runtime": "0.13.7", "regenerator-runtime": "0.13.7",

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

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

View File

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

View File

@@ -1,11 +1,10 @@
/* globals jQuery */ /* globals $ */
/** /**
* Recalculate. * Recalculate.
* @module recalculate * @module recalculate
* @license MIT * @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 { NS } from '../common/namespaces.js';
import { convertToNum } from '../common/units.js'; import { convertToNum } from '../common/units.js';
import { isWebkit } from '../common/browser.js'; import { isWebkit } from '../common/browser.js';
@@ -18,8 +17,6 @@ import {
hasMatrixTransform hasMatrixTransform
} from './math.js'; } from './math.js';
const $ = jQueryPluginSVG(jQuery);
let context_; let context_;
/** /**

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
/* globals jQuery */ /* globals $ */
/** /**
* Miscellaneous utilities. * Miscellaneous utilities.
* @module utilities * @module utilities
@@ -7,7 +7,6 @@
* @copyright 2010 Alexis Deveria, 2010 Jeff Schiller * @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 { NS } from '../common/namespaces.js';
import { getTransformList } from './svgtransformlist.js'; import { getTransformList } from './svgtransformlist.js';
import { setUnitAttr, getTypeMap } from '../common/units.js'; import { setUnitAttr, getTypeMap } from '../common/units.js';
@@ -20,9 +19,6 @@ import {
} from '../common/browser.js'; } from '../common/browser.js';
import { getClosest } from '../editor/components/jgraduate/Util.js'; import { getClosest } from '../editor/components/jgraduate/Util.js';
// Constants
const $ = jQueryPluginSVG(jQuery);
// String used to encode base64. // String used to encode base64.
const KEYSTR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='; const KEYSTR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';