From 82fab95988dadaeb1a832c699a56483c46183821 Mon Sep 17 00:00:00 2001 From: JFH <20402845+jfhenon@users.noreply.github.com> Date: Sat, 1 Jan 2022 09:27:45 -0300 Subject: [PATCH] minor es6 improvements --- src/svgcanvas/blur-event.js | 2 +- src/svgcanvas/coords.js | 2 +- src/svgcanvas/draw.js | 2 +- src/svgcanvas/elem-get-set.js | 2 +- src/svgcanvas/json.js | 2 +- src/svgcanvas/paste-elem.js | 2 +- src/svgcanvas/path-actions.js | 2 +- src/svgcanvas/path-method.js | 2 +- src/svgcanvas/recalculate.js | 8 ++++---- src/svgcanvas/selected-elem.js | 2 +- src/svgcanvas/selection.js | 26 +++++++++++++------------- src/svgcanvas/svg-exec.js | 2 +- src/svgcanvas/text-actions.js | 2 +- src/svgcanvas/utilities.js | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/svgcanvas/blur-event.js b/src/svgcanvas/blur-event.js index 7acda3c9..8cd945f9 100644 --- a/src/svgcanvas/blur-event.js +++ b/src/svgcanvas/blur-event.js @@ -12,7 +12,7 @@ let svgCanvas = null * @param {module:blur.blurContext} blurContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/coords.js b/src/svgcanvas/coords.js index fca06b54..c86bd6d3 100644 --- a/src/svgcanvas/coords.js +++ b/src/svgcanvas/coords.js @@ -36,7 +36,7 @@ let svgCanvas = null * @param {module:svgcanvas.SvgCanvas#event:pointsAdded} editorContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/draw.js b/src/svgcanvas/draw.js index 0e23ea14..997c4963 100644 --- a/src/svgcanvas/draw.js +++ b/src/svgcanvas/draw.js @@ -754,7 +754,7 @@ let svgCanvas * @param {module:draw.DrawCanvasInit} canvas * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/elem-get-set.js b/src/svgcanvas/elem-get-set.js index 5dd14fcb..854c78bf 100644 --- a/src/svgcanvas/elem-get-set.js +++ b/src/svgcanvas/elem-get-set.js @@ -22,7 +22,7 @@ let svgCanvas = null * @param {module:elem-get-set.elemContext} elemContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/json.js b/src/svgcanvas/json.js index 0c00f05a..3537c9cf 100644 --- a/src/svgcanvas/json.js +++ b/src/svgcanvas/json.js @@ -25,7 +25,7 @@ let svgdoc_ = null * @param {module:json.jsonContext} jsonContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas svgdoc_ = canvas.getDOMDocument() } diff --git a/src/svgcanvas/paste-elem.js b/src/svgcanvas/paste-elem.js index f112a48b..8050c61c 100644 --- a/src/svgcanvas/paste-elem.js +++ b/src/svgcanvas/paste-elem.js @@ -14,7 +14,7 @@ let svgCanvas = null * @param {module:paste-elem.pasteContext} pasteContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/path-actions.js b/src/svgcanvas/path-actions.js index b6349392..6deecbb2 100644 --- a/src/svgcanvas/path-actions.js +++ b/src/svgcanvas/path-actions.js @@ -26,7 +26,7 @@ let path = null * @param {module:path-actions.svgCanvas} pathActionsContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/path-method.js b/src/svgcanvas/path-method.js index fa5b1ad8..30890d31 100644 --- a/src/svgcanvas/path-method.js +++ b/src/svgcanvas/path-method.js @@ -23,7 +23,7 @@ let svgCanvas = null * @param {module:path-actions.svgCanvas} pathMethodsContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/recalculate.js b/src/svgcanvas/recalculate.js index f2a1a045..343f9a36 100644 --- a/src/svgcanvas/recalculate.js +++ b/src/svgcanvas/recalculate.js @@ -41,7 +41,7 @@ let svgCanvas * @param {module:recalculate.EditorContext} editorContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } @@ -53,7 +53,7 @@ export const init = function (canvas) { * @param {Float} ty - The translation's y value * @returns {void} */ -export const updateClipPath = function (attr, tx, ty) { +export const updateClipPath = (attr, tx, ty) => { const path = getRefElem(attr).firstChild const cpXform = path.transform.baseVal const newxlate = svgCanvas.getSvgRoot().createSVGTransform() @@ -71,7 +71,7 @@ export const updateClipPath = function (attr, tx, ty) { * @param {Element} selected - The DOM element to recalculate * @returns {Command} Undo command object with the resulting change */ -export const recalculateDimensions = function (selected) { +export const recalculateDimensions = (selected) => { if (!selected) return null const svgroot = svgCanvas.getSvgRoot() const dataStorage = svgCanvas.getDataStorage() @@ -215,7 +215,7 @@ export const recalculateDimensions = function (selected) { } // switch on element type to get initial values if (attrs.length) { - Array.prototype.forEach.call(attrs, function (attr) { + Array.prototype.forEach.call(attrs, (attr) => { changes[attr] = selected.getAttribute(attr) }) for (const [attr, val] of Object.entries(changes)) { diff --git a/src/svgcanvas/selected-elem.js b/src/svgcanvas/selected-elem.js index f97a06ab..544d65dc 100644 --- a/src/svgcanvas/selected-elem.js +++ b/src/svgcanvas/selected-elem.js @@ -35,7 +35,7 @@ let svgCanvas = null * @param {module:selected-elem.elementContext} elementContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/selection.js b/src/svgcanvas/selection.js index a16c5f29..744d9585 100644 --- a/src/svgcanvas/selection.js +++ b/src/svgcanvas/selection.js @@ -26,7 +26,7 @@ let svgCanvas = null * @param {module:selection.selectionContext} selectionContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } @@ -37,7 +37,7 @@ export const init = function (canvas) { * @type {module:draw.DrawCanvasInit#clearSelection|module:path.EditorContext#clearSelection} * @fires module:selection.SvgCanvas#event:selected */ -export const clearSelectionMethod = function (noCall) { +export const clearSelectionMethod = (noCall) => { const selectedElements = svgCanvas.getSelectedElements() selectedElements.forEach((elem) => { if (!elem) { @@ -59,7 +59,7 @@ export const clearSelectionMethod = function (noCall) { * @type {module:path.EditorContext#addToSelection} * @fires module:selection.SvgCanvas#event:selected */ -export const addToSelectionMethod = function (elemsToAdd, showGrips) { +export const addToSelectionMethod = (elemsToAdd, showGrips) => { const selectedElements = svgCanvas.getSelectedElements() if (!elemsToAdd.length) { return @@ -115,7 +115,7 @@ export const addToSelectionMethod = function (elemsToAdd, showGrips) { // make sure the elements are in the correct order // See: https://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-compareDocumentPosition - selectedElements.sort(function (a, b) { + selectedElements.sort((a, b) => { if (a && b && a.compareDocumentPosition) { return 3 - (b.compareDocumentPosition(a) & 6) } @@ -134,7 +134,7 @@ export const addToSelectionMethod = function (elemsToAdd, showGrips) { * @name module:svgcanvas.SvgCanvas#getMouseTarget * @type {module:path.EditorContext#getMouseTarget} */ -export const getMouseTargetMethod = function (evt) { +export const getMouseTargetMethod = (evt) => { if (!evt) { return null } @@ -212,12 +212,12 @@ export const getMouseTargetMethod = function (evt) { * @returns {GenericArray|module:svgcanvas.ExtensionStatus|false} See {@tutorial ExtensionDocs} on the ExtensionStatus. */ /* eslint-enable max-len */ -export const runExtensionsMethod = function ( +export const runExtensionsMethod = ( action, vars, returnArray, nameFilter -) { +) => { let result = returnArray ? [] : false for (const [name, ext] of Object.entries(svgCanvas.getExtensions())) { if (nameFilter && !nameFilter(name)) { @@ -245,7 +245,7 @@ export const runExtensionsMethod = function ( * @param {Element} parent - The parent DOM element to search within * @returns {ElementAndBBox[]} An array with objects that include: */ -export const getVisibleElementsAndBBoxes = function (parent) { +export const getVisibleElementsAndBBoxes = (parent) => { if (!parent) { const svgContent = svgCanvas.getSvgContent() parent = svgContent.children // Prevent layers from being included @@ -272,7 +272,7 @@ export const getVisibleElementsAndBBoxes = function (parent) { * @param {SVGRect} rect * @returns {Element[]|NodeList} Bbox elements */ -export const getIntersectionListMethod = function (rect) { +export const getIntersectionListMethod = (rect) => { const zoom = svgCanvas.getZoom() if (!svgCanvas.getRubberBox()) { return null @@ -335,7 +335,7 @@ export const getIntersectionListMethod = function (rect) { * @param {Element} elem - SVG element to wrap * @returns {void} */ -export const groupSvgElem = function (elem) { +export const groupSvgElem = (elem) => { const dataStorage = svgCanvas.getDataStorage() const g = document.createElementNS(NS.SVG, 'g') elem.replaceWith(g) @@ -350,7 +350,7 @@ export const groupSvgElem = function (elem) { * @param {XMLDocument} newDoc - The SVG DOM document * @returns {void} */ -export const prepareSvg = function (newDoc) { +export const prepareSvg = (newDoc) => { svgCanvas.sanitizeSvg(newDoc.documentElement) // convert paths into absolute commands @@ -371,7 +371,7 @@ export const prepareSvg = function (newDoc) { * @fires module:svgcanvas.SvgCanvas#event:changed * @returns {void} */ -export const setRotationAngle = function (val, preventUndo) { +export const setRotationAngle = (val, preventUndo) => { const selectedElements = svgCanvas.getSelectedElements() // ensure val is the proper type val = Number.parseFloat(val) @@ -441,7 +441,7 @@ export const setRotationAngle = function (val, preventUndo) { * @fires module:svgcanvas.SvgCanvas#event:changed * @returns {void} */ -export const recalculateAllSelectedDimensions = function () { +export const recalculateAllSelectedDimensions = () => { const text = svgCanvas.getCurrentResizeMode() === 'none' ? 'position' : 'size' const batchCmd = new BatchCommand(text) diff --git a/src/svgcanvas/svg-exec.js b/src/svgcanvas/svg-exec.js index f1f246fc..04a57469 100644 --- a/src/svgcanvas/svg-exec.js +++ b/src/svgcanvas/svg-exec.js @@ -41,7 +41,7 @@ let svgCanvas = null * @param {module:svg-exec.SvgCanvas#init} svgContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/text-actions.js b/src/svgcanvas/text-actions.js index 0a42517f..0f017c06 100644 --- a/src/svgcanvas/text-actions.js +++ b/src/svgcanvas/text-actions.js @@ -23,7 +23,7 @@ let svgCanvas = null * @param {module:text-actions.svgCanvas} textActionsContext * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas } diff --git a/src/svgcanvas/utilities.js b/src/svgcanvas/utilities.js index 0d9c5dcc..3db8461b 100644 --- a/src/svgcanvas/utilities.js +++ b/src/svgcanvas/utilities.js @@ -80,7 +80,7 @@ let svgroot_ = null * @param {module:utilities.EditorContext} canvas * @returns {void} */ -export const init = function (canvas) { +export const init = (canvas) => { svgCanvas = canvas svgroot_ = canvas.getSvgRoot() }