github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor (incomplete)

Browse Source
This commit is contained in:
JFH
2021-12-25 17:25:12 -03:00
parent a529258774
commit 11ee55067c
42 changed files with 1626 additions and 2326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor/Editor.js
View File

@@ -729,7 +729,7 @@ class Editor extends EditorStartup {
multiplier = multiplier ? resolution.zoom * multiplier : 1;
// setResolution(res.w * multiplier, res.h * multiplier, true);
$id('zoom').value = (multiplier * 100).toFixed(1);
this.svgCanvas.setZoom(multiplier);
this.svgCanvas.setCurrentZoom(multiplier);
this.zoomDone();
this.updateCanvas(true);
}
@@ -1116,7 +1116,7 @@ class Editor extends EditorStartup {
if (!this.svgCanvas) {
throw new Error('Extension added too early');
}
return this.svgCanvas.addExtension.call(this, name, initfn, initArgs);
return this.svgCanvas.addExtension( name, initfn, initArgs);
}
}

2
src/editor/Rulers.js
View File

@@ -58,7 +58,7 @@ class Rulers {
let d; let i;
const limit = 30000;
const contentElem = this.svgCanvas.getContentElem();
const contentElem = this.svgCanvas.getSvgContent();
const units = getTypeMap();
const unit = units[this.editor.configObj.curConfig.baseUnit]; // 1 = 1px

2
src/editor/extensions/ext-eyedropper/ext-eyedropper.js
View File

@@ -28,7 +28,7 @@ export default {
async init(S) {
const svgEditor = this;
await loadExtensionTranslation(svgEditor);
const { ChangeElementCommand } = S; // , svgcontent,
const { ChangeElementCommand } = S;
// svgdoc = S.svgroot.parentNode.ownerDocument,
const { svgCanvas } = svgEditor;
const addToHistory = function (cmd) { svgCanvas.undoMgr.addCommandToHistory(cmd); };

2
src/editor/extensions/ext-imagelib/ext-imagelib.js
View File

@@ -71,7 +71,7 @@ export default {
* @returns {void}
*/
const importImage = (url) => {
const newImage = svgCanvas.addSVGElementFromJson({
const newImage = svgCanvas.addSVGElemensFromJson({
element: 'image',
attr: {
x: 0,

8
src/editor/extensions/ext-markers/ext-markers.js
View File

@@ -32,7 +32,7 @@ export default {
async init (S) {
const svgEditor = this;
const { svgCanvas } = svgEditor;
const { $id, addSVGElementFromJson: addElem } = svgCanvas;
const { $id, addSVGElemensFromJson: addElem } = svgCanvas;
const mtypes = [ 'start', 'mid', 'end' ];
const markerElems = [ 'line', 'path', 'polyline', 'polygon' ];
@@ -99,7 +99,7 @@ export default {
* @returns {SVGMarkerElement}
*/
const addMarker = (id, seType) => {
const selElems = svgCanvas.getSelectedElems();
const selElems = svgCanvas.getSelectedElements();
let marker = svgCanvas.getElem(id);
if (marker) { return undefined; }
if (seType === '' || seType === 'nomarker') { return undefined; }
@@ -200,7 +200,7 @@ export default {
* @returns {void}
*/
const setMarker = (pos, markerType) => {
const selElems = svgCanvas.getSelectedElems();
const selElems = svgCanvas.getSelectedElements();
if (selElems.length === 0) return;
const markerName = 'marker-' + pos;
const el = selElems[0];
@@ -252,7 +252,7 @@ export default {
* @returns {void}
*/
const updateReferences = (el) => {
const selElems = svgCanvas.getSelectedElems();
const selElems = svgCanvas.getSelectedElements();
mtypes.forEach((pos) => {
const markerName = 'marker-' + pos;
const marker = getLinked(el, markerName);

2
src/editor/extensions/ext-opensave/ext-opensave.js
View File

@@ -83,7 +83,7 @@ export default {
* @returns {void}
*/
const insertNewImage = (imageWidth, imageHeight) => {
const newImage = this.svgCanvas.addSVGElementFromJson({
const newImage = this.svgCanvas.addSVGElemensFromJson({
element: 'image',
attr: {
x: 0,

4
src/editor/extensions/ext-polystar/ext-polystar.js
View File

@@ -246,7 +246,7 @@ export default {
const sRgb = svgCanvas.getColor("stroke");
const sWidth = svgCanvas.getStrokeWidth();
started = true;
newFO = svgCanvas.addSVGElementFromJson({
newFO = svgCanvas.addSVGElemensFromJson({
element: "polygon",
attr: {
cx: opts.start_x,
@@ -275,7 +275,7 @@ export default {
// ccSRgbEl = sRgb.substring(1, rgb.length);
const sWidth = svgCanvas.getStrokeWidth();
started = true;
newFO = svgCanvas.addSVGElementFromJson({
newFO = svgCanvas.addSVGElemensFromJson({
element: "polygon",
attr: {
cx: opts.start_x,

4
src/editor/extensions/ext-shapes/ext-shapes.js
View File

@@ -27,7 +27,7 @@ export default {
const svgEditor = this;
const canv = svgEditor.svgCanvas;
const { $id } = canv;
const svgroot = canv.getRootElem();
const svgroot = canv.getSvgRoot();
let lastBBox = {};
await loadExtensionTranslation(svgEditor);
@@ -67,7 +67,7 @@ export default {
startClientPos.x = opts.event.clientX;
startClientPos.y = opts.event.clientY;
curShape = canv.addSVGElementFromJson({
curShape = canv.addSVGElemensFromJson({
element: 'path',
curStyles: true,
attr: {

6
src/editor/extensions/ext-storage/ext-storage.js
View File

@@ -100,7 +100,7 @@ export default {
} else {
removeStoragePrefCookie();
if (svgEditor.configObj.curConfig.emptyStorageOnDecline && e?.detail?.checkbox) {
this.setSVGContentStorage('');
this.setSvgContentStorage('');
Object.keys(svgEditor.curPrefs).forEach((name) => {
name = 'svg-edit-' + name;
if (svgEditor.storage) {
@@ -128,7 +128,7 @@ export default {
* @param {string} val
* @returns {void}
*/
function setSVGContentStorage (val) {
function setSvgContentStorage (val) {
if (storage) {
const name = 'svgedit-' + svgEditor.configObj.curConfig.canvasName;
if (!val) {
@@ -155,7 +155,7 @@ export default {
return;
}
if ((/(?:^|;\s*)svgeditstore=prefsAndContent/).test(document.cookie)) {
setSVGContentStorage(svgCanvas.getSvgString());
setSvgContentStorage(svgCanvas.getSvgString());
}
svgEditor.setConfig({ no_save_warning: true }); // No need for explicit saving at all once storage is on

2
src/editor/extensions/ext-storage/storageDialog.js
View File

@@ -139,7 +139,7 @@ export class SeStorageDialog extends HTMLElement {
* @param {string} val
* @returns {void}
*/
setSVGContentStorage (val) {
setSvgContentStorage (val) {
if (this.storage) {
const name = 'svgedit-' + this.configObj.curConfig.canvasName;
if (!val) {

2
src/editor/panels/TopPanel.js
View File

@@ -780,7 +780,7 @@ class TopPanel {
.then(() => {
// switch into "select" mode if we've clicked on an element
editor.svgCanvas.setMode('select');
editor.svgCanvas.selectOnly(editor.svgCanvas.getSelectedElems(), true);
editor.svgCanvas.selectOnly(editor.svgCanvas.getSelectedElements(), true);
}, (error) => {
console.error("error =", error);
seAlert(editor.i18next.t('tools.no_embed'));